From 67a07708424333d4b5997b40420e2cbac04c0f27 Mon Sep 17 00:00:00 2001 From: devhl Date: Sat, 11 Jul 2026 00:09:59 -0400 Subject: [PATCH 1/4] refactor duplicate apis --- .../csharp/libraries/generichost/api.mustache | 66 +++++++------ .../src/Org.OpenAPITools/Api/APIKeys0Api.cs | 99 ++++++++++++++++--- .../src/Org.OpenAPITools/Api/ApiKeys1Api.cs | 99 ++++++++++++++++--- 3 files changed, 210 insertions(+), 54 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache index dac3c682f0d3..0a36a7d59bf1 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache @@ -61,11 +61,11 @@ namespace {{packageName}}.{{apiPackage}} /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} /// Cancellation Token to cancel the request. - /// <> + /// <> {{#isDeprecated}} [Obsolete] {{/isDeprecated}} - Task<{{interfacePrefix}}{{operationId}}ApiResponse> {{operationId}}Async({{>OperationSignature}}); + Task<{{interfacePrefix}}{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse> {{operationId}}Async({{>OperationSignature}}); /// /// {{summary}} @@ -77,25 +77,31 @@ namespace {{packageName}}.{{apiPackage}} /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}{{#isDeprecated}} (deprecated){{/isDeprecated}} {{/allParams}} /// Cancellation Token to cancel the request. - /// <{{nrt?}}> + /// <{{nrt?}}> {{#isDeprecated}} [Obsolete] {{/isDeprecated}} - Task<{{interfacePrefix}}{{operationId}}ApiResponse{{nrt?}}> {{operationId}}OrDefaultAsync({{>OperationSignature}}); + Task<{{interfacePrefix}}{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse{{nrt?}}> {{operationId}}OrDefaultAsync({{>OperationSignature}}); {{^-last}} {{/-last}} {{/operation}} } {{#operation}} - {{^vendorExtensions.x-duplicates}} + {{#lambda.copy}} + {{#lambda.trim}} + {{#vendorExtensions.x-duplicates}} + {{classname}} + {{/vendorExtensions.x-duplicates}} + {{/lambda.trim}} + {{/lambda.copy}} {{#responses}} {{#-first}} /// - /// The + /// The /// - {{>visibility}} interface {{interfacePrefix}}{{operationId}}ApiResponse : {{#lambda.joinWithComma}}{{packageName}}.{{clientPackage}}.{{interfacePrefix}}ApiResponse {{#responses}}{{#dataType}}{{interfacePrefix}}{{vendorExtensions.x-http-status}}<{{#isModel}}{{^containerType}}{{packageName}}.{{modelPackage}}.{{/containerType}}{{/isModel}}{{{dataType}}}{{#nrt}}?{{/nrt}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}> {{/dataType}}{{/responses}}{{/lambda.joinWithComma}} + {{>visibility}} interface {{interfacePrefix}}{{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse : {{#lambda.joinWithComma}}{{packageName}}.{{clientPackage}}.{{interfacePrefix}}ApiResponse {{#responses}}{{#dataType}}{{interfacePrefix}}{{vendorExtensions.x-http-status}}<{{#isModel}}{{^containerType}}{{packageName}}.{{modelPackage}}.{{/containerType}}{{/isModel}}{{{dataType}}}{{#nrt}}?{{/nrt}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}> {{/dataType}}{{/responses}}{{/lambda.joinWithComma}} { {{#responses}} {{#vendorExtensions.x-http-status-is-default}} @@ -119,7 +125,6 @@ namespace {{packageName}}.{{apiPackage}} } {{/-first}} {{/responses}} - {{/vendorExtensions.x-duplicates}} {{/operation}} /// @@ -139,7 +144,7 @@ namespace {{packageName}}.{{apiPackage}} /// public event EventHandler{{nrt?}} OnError{{operationId}}; - internal void ExecuteOn{{operationId}}({{#vendorExtensions.x-duplicates}}{{.}}{{/vendorExtensions.x-duplicates}}{{^vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}.{{operationId}}ApiResponse apiResponse) + internal void ExecuteOn{{operationId}}({{classname}}.{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse apiResponse) { On{{operationId}}?.Invoke(this, new ApiResponseEventArgs(apiResponse)); } @@ -288,7 +293,7 @@ namespace {{packageName}}.{{apiPackage}} {{#allParams}} /// {{/allParams}} - private void After{{operationId}}DefaultImplementation({{#lambda.joinWithComma}}{{interfacePrefix}}{{operationId}}ApiResponse apiResponseLocalVar {{#allParams}}{{^required}}Option<{{/required}}{{>OperationDataType}}{{^required}}>{{/required}} {{paramName}} {{/allParams}}{{/lambda.joinWithComma}}) + private void After{{operationId}}DefaultImplementation({{#lambda.joinWithComma}}{{interfacePrefix}}{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse apiResponseLocalVar {{#allParams}}{{^required}}Option<{{/required}}{{>OperationDataType}}{{^required}}>{{/required}} {{paramName}} {{/allParams}}{{/lambda.joinWithComma}}) { bool suppressDefaultLog = false; After{{operationId}}({{#lambda.joinWithComma}}ref suppressDefaultLog apiResponseLocalVar {{#allParams}}{{paramName}} {{/allParams}}{{/lambda.joinWithComma}}); @@ -303,7 +308,7 @@ namespace {{packageName}}.{{apiPackage}} {{#allParams}} /// {{/allParams}} - partial void After{{operationId}}({{#lambda.joinWithComma}}ref bool suppressDefaultLog {{interfacePrefix}}{{operationId}}ApiResponse apiResponseLocalVar {{#allParams}}{{^required}}Option<{{/required}}{{>OperationDataType}}{{^required}}>{{/required}} {{paramName}} {{/allParams}}{{/lambda.joinWithComma}}); + partial void After{{operationId}}({{#lambda.joinWithComma}}ref bool suppressDefaultLog {{interfacePrefix}}{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse apiResponseLocalVar {{#allParams}}{{^required}}Option<{{/required}}{{>OperationDataType}}{{^required}}>{{/required}} {{paramName}} {{/allParams}}{{/lambda.joinWithComma}}); /// /// Logs exceptions that occur while retrieving the server response @@ -341,8 +346,8 @@ namespace {{packageName}}.{{apiPackage}} /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} {{/allParams}} /// Cancellation Token to cancel the request. - /// <> - public async Task<{{interfacePrefix}}{{operationId}}ApiResponse{{nrt?}}> {{operationId}}OrDefaultAsync({{>OperationSignature}}) + /// <> + public async Task<{{interfacePrefix}}{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse{{nrt?}}> {{operationId}}OrDefaultAsync({{>OperationSignature}}) { try { @@ -362,8 +367,8 @@ namespace {{packageName}}.{{apiPackage}} /// {{description}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}} {{/allParams}} /// Cancellation Token to cancel the request. - /// <> - public async Task<{{interfacePrefix}}{{operationId}}ApiResponse> {{operationId}}Async({{>OperationSignature}}) + /// <> + public async Task<{{interfacePrefix}}{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse> {{operationId}}Async({{>OperationSignature}}) { {{#lambda.trimLineBreaks}} UriBuilder uriBuilderLocalVar = new UriBuilder(); @@ -716,8 +721,8 @@ namespace {{packageName}}.{{apiPackage}} using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger<{{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse> apiResponseLoggerLocalVar = LoggerFactory.CreateLogger<{{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse>(); - {{#vendorExtensions.x-duplicates}}{{.}}.{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse apiResponseLocalVar; + ILogger<{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse> apiResponseLoggerLocalVar = LoggerFactory.CreateLogger<{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse>(); + {{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { {{#responses}} @@ -731,7 +736,7 @@ namespace {{packageName}}.{{apiPackage}} { byte[] responseBytesArrayLocalVar = await httpResponseMessageLocalVar.Content.ReadAsByteArrayAsync({{#net60OrLater}}cancellationToken{{/net60OrLater}}).ConfigureAwait(false); System.IO.Stream responseContentStreamLocalVar = new System.IO.MemoryStream(responseBytesArrayLocalVar); - apiResponseLocalVar = new{{^net60OrLater}} {{operationId}}ApiResponse{{/net60OrLater}}(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentStreamLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new{{^net60OrLater}} {{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse{{/net60OrLater}}(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentStreamLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -740,7 +745,7 @@ namespace {{packageName}}.{{apiPackage}} {{/responses}} default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync({{#net60OrLater}}cancellationToken{{/net60OrLater}}).ConfigureAwait(false); - apiResponseLocalVar = new{{^net60OrLater}} {{operationId}}ApiResponse{{/net60OrLater}}(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new{{^net60OrLater}} {{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse{{/net60OrLater}}(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -803,22 +808,28 @@ namespace {{packageName}}.{{apiPackage}} } {{/lambda.trimLineBreaks}} } - {{^vendorExtensions.x-duplicates}} + {{#lambda.copy}} + {{#lambda.trim}} + {{#vendorExtensions.x-duplicates}} + {{classname}} + {{/vendorExtensions.x-duplicates}} + {{/lambda.trim}} + {{/lambda.copy}} {{#responses}} {{#-first}} /// - /// The + /// The /// - {{>visibility}} partial class {{operationId}}ApiResponse : {{packageName}}.{{clientPackage}}.ApiResponse, {{interfacePrefix}}{{operationId}}ApiResponse + {{>visibility}} partial class {{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse : {{packageName}}.{{clientPackage}}.ApiResponse, {{interfacePrefix}}{{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse { /// /// The logger /// - public ILogger<{{operationId}}ApiResponse> Logger { get; } + public ILogger<{{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse> Logger { get; } /// - /// The + /// The /// /// /// @@ -827,14 +838,14 @@ namespace {{packageName}}.{{apiPackage}} /// /// /// - public {{operationId}}ApiResponse(ILogger<{{operationId}}ApiResponse> logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public {{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse(ILogger<{{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse> logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); } /// - /// The + /// The /// /// /// @@ -843,7 +854,7 @@ namespace {{packageName}}.{{apiPackage}} /// /// /// - public {{operationId}}ApiResponse(ILogger<{{operationId}}ApiResponse> logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public {{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse(ILogger<{{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse> logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -932,7 +943,6 @@ namespace {{packageName}}.{{apiPackage}} } {{/-first}} {{/responses}} - {{/vendorExtensions.x-duplicates}} {{/operation}} } {{/operations}} diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs index f20672ad6a9f..d19dd1adacb2 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs @@ -46,8 +46,8 @@ public interface IAPIKeysApi : IApi /// Thrown when fails to make API call /// Api Key ID. /// Cancellation Token to cancel the request. - /// <> - Task GetApiKeysIdAsync(int id, System.Threading.CancellationToken cancellationToken = default); + /// <> + Task GetApiKeysIdAsync(int id, System.Threading.CancellationToken cancellationToken = default); /// /// Show API Key @@ -57,8 +57,20 @@ public interface IAPIKeysApi : IApi /// /// Api Key ID. /// Cancellation Token to cancel the request. - /// <?> - Task GetApiKeysIdOrDefaultAsync(int id, System.Threading.CancellationToken cancellationToken = default); + /// <?> + Task GetApiKeysIdOrDefaultAsync(int id, System.Threading.CancellationToken cancellationToken = default); + } + + /// + /// The + /// + public interface IAPIKeysApiGetApiKeysIdApiResponse : Org.OpenAPITools.Client.IApiResponse + { + /// + /// Returns true if the response is 400 BadRequest + /// + /// + bool IsBadRequest { get; } } /// @@ -76,7 +88,7 @@ public class APIKeysApiEvents /// public event EventHandler? OnErrorGetApiKeysId; - internal void ExecuteOnGetApiKeysId(APIKEYSApi.GetApiKeysIdApiResponse apiResponse) + internal void ExecuteOnGetApiKeysId(APIKeysApi.APIKeysApiGetApiKeysIdApiResponse apiResponse) { OnGetApiKeysId?.Invoke(this, new ApiResponseEventArgs(apiResponse)); } @@ -141,7 +153,7 @@ public APIKeysApi(ILogger logger, ILoggerFactory loggerFactory, Http /// /// /// - private void AfterGetApiKeysIdDefaultImplementation(IGetApiKeysIdApiResponse apiResponseLocalVar, int id) + private void AfterGetApiKeysIdDefaultImplementation(IAPIKeysApiGetApiKeysIdApiResponse apiResponseLocalVar, int id) { bool suppressDefaultLog = false; AfterGetApiKeysId(ref suppressDefaultLog, apiResponseLocalVar, id); @@ -155,7 +167,7 @@ private void AfterGetApiKeysIdDefaultImplementation(IGetApiKeysIdApiResponse api /// /// /// - partial void AfterGetApiKeysId(ref bool suppressDefaultLog, IGetApiKeysIdApiResponse apiResponseLocalVar, int id); + partial void AfterGetApiKeysId(ref bool suppressDefaultLog, IAPIKeysApiGetApiKeysIdApiResponse apiResponseLocalVar, int id); /// /// Logs exceptions that occur while retrieving the server response @@ -187,8 +199,8 @@ private void OnErrorGetApiKeysIdDefaultImplementation(Exception exceptionLocalVa /// /// Api Key ID. /// Cancellation Token to cancel the request. - /// <> - public async Task GetApiKeysIdOrDefaultAsync(int id, System.Threading.CancellationToken cancellationToken = default) + /// <> + public async Task GetApiKeysIdOrDefaultAsync(int id, System.Threading.CancellationToken cancellationToken = default) { try { @@ -206,8 +218,8 @@ private void OnErrorGetApiKeysIdDefaultImplementation(Exception exceptionLocalVa /// Thrown when fails to make API call /// Api Key ID. /// Cancellation Token to cancel the request. - /// <> - public async Task GetApiKeysIdAsync(int id, System.Threading.CancellationToken cancellationToken = default) + /// <> + public async Task GetApiKeysIdAsync(int id, System.Threading.CancellationToken cancellationToken = default) { UriBuilder uriBuilderLocalVar = new UriBuilder(); @@ -233,8 +245,8 @@ public async Task GetApiKeysIdAsync(int id, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); - APIKEYSApi.GetApiKeysIdApiResponse apiResponseLocalVar; + ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); + APIKeysApiGetApiKeysIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { @@ -260,5 +272,66 @@ public async Task GetApiKeysIdAsync(int id, System.Thr throw; } } + + /// + /// The + /// + public partial class APIKeysApiGetApiKeysIdApiResponse : Org.OpenAPITools.Client.ApiResponse, IAPIKeysApiGetApiKeysIdApiResponse + { + /// + /// The logger + /// + public ILogger Logger { get; } + + /// + /// The + /// + /// + /// + /// + /// + /// + /// + /// + public APIKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + { + Logger = logger; + OnCreated(httpRequestMessage, httpResponseMessage); + } + + /// + /// The + /// + /// + /// + /// + /// + /// + /// + /// + public APIKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + { + Logger = logger; + OnCreated(httpRequestMessage, httpResponseMessage); + } + + partial void OnCreated(global::System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage); + + /// + /// Returns true if the response is 400 BadRequest + /// + /// + public bool IsBadRequest => 400 == (int)StatusCode; + + private void OnDeserializationErrorDefaultImplementation(Exception exception, HttpStatusCode httpStatusCode) + { + bool suppressDefaultLog = false; + OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); + if (!suppressDefaultLog) + Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + } + + partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); + } } } diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs index 3ab7b63c69af..3fe1cad70732 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs @@ -46,8 +46,8 @@ public interface IApiKeysApi : IApi /// Thrown when fails to make API call /// Api Key ID. /// Cancellation Token to cancel the request. - /// <> - Task GetApiKeysIdAsync(int id, System.Threading.CancellationToken cancellationToken = default); + /// <> + Task GetApiKeysIdAsync(int id, System.Threading.CancellationToken cancellationToken = default); /// /// Show API Key @@ -57,8 +57,20 @@ public interface IApiKeysApi : IApi /// /// Api Key ID. /// Cancellation Token to cancel the request. - /// <?> - Task GetApiKeysIdOrDefaultAsync(int id, System.Threading.CancellationToken cancellationToken = default); + /// <?> + Task GetApiKeysIdOrDefaultAsync(int id, System.Threading.CancellationToken cancellationToken = default); + } + + /// + /// The + /// + public interface IApiKeysApiGetApiKeysIdApiResponse : Org.OpenAPITools.Client.IApiResponse + { + /// + /// Returns true if the response is 400 BadRequest + /// + /// + bool IsBadRequest { get; } } /// @@ -76,7 +88,7 @@ public class ApiKeysApiEvents /// public event EventHandler? OnErrorGetApiKeysId; - internal void ExecuteOnGetApiKeysId(APIKEYSApi.GetApiKeysIdApiResponse apiResponse) + internal void ExecuteOnGetApiKeysId(ApiKeysApi.ApiKeysApiGetApiKeysIdApiResponse apiResponse) { OnGetApiKeysId?.Invoke(this, new ApiResponseEventArgs(apiResponse)); } @@ -141,7 +153,7 @@ public ApiKeysApi(ILogger logger, ILoggerFactory loggerFactory, Http /// /// /// - private void AfterGetApiKeysIdDefaultImplementation(IGetApiKeysIdApiResponse apiResponseLocalVar, int id) + private void AfterGetApiKeysIdDefaultImplementation(IApiKeysApiGetApiKeysIdApiResponse apiResponseLocalVar, int id) { bool suppressDefaultLog = false; AfterGetApiKeysId(ref suppressDefaultLog, apiResponseLocalVar, id); @@ -155,7 +167,7 @@ private void AfterGetApiKeysIdDefaultImplementation(IGetApiKeysIdApiResponse api /// /// /// - partial void AfterGetApiKeysId(ref bool suppressDefaultLog, IGetApiKeysIdApiResponse apiResponseLocalVar, int id); + partial void AfterGetApiKeysId(ref bool suppressDefaultLog, IApiKeysApiGetApiKeysIdApiResponse apiResponseLocalVar, int id); /// /// Logs exceptions that occur while retrieving the server response @@ -187,8 +199,8 @@ private void OnErrorGetApiKeysIdDefaultImplementation(Exception exceptionLocalVa /// /// Api Key ID. /// Cancellation Token to cancel the request. - /// <> - public async Task GetApiKeysIdOrDefaultAsync(int id, System.Threading.CancellationToken cancellationToken = default) + /// <> + public async Task GetApiKeysIdOrDefaultAsync(int id, System.Threading.CancellationToken cancellationToken = default) { try { @@ -206,8 +218,8 @@ private void OnErrorGetApiKeysIdDefaultImplementation(Exception exceptionLocalVa /// Thrown when fails to make API call /// Api Key ID. /// Cancellation Token to cancel the request. - /// <> - public async Task GetApiKeysIdAsync(int id, System.Threading.CancellationToken cancellationToken = default) + /// <> + public async Task GetApiKeysIdAsync(int id, System.Threading.CancellationToken cancellationToken = default) { UriBuilder uriBuilderLocalVar = new UriBuilder(); @@ -233,8 +245,8 @@ public async Task GetApiKeysIdAsync(int id, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); - APIKEYSApi.GetApiKeysIdApiResponse apiResponseLocalVar; + ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); + ApiKeysApiGetApiKeysIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { @@ -260,5 +272,66 @@ public async Task GetApiKeysIdAsync(int id, System.Thr throw; } } + + /// + /// The + /// + public partial class ApiKeysApiGetApiKeysIdApiResponse : Org.OpenAPITools.Client.ApiResponse, IApiKeysApiGetApiKeysIdApiResponse + { + /// + /// The logger + /// + public ILogger Logger { get; } + + /// + /// The + /// + /// + /// + /// + /// + /// + /// + /// + public ApiKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + { + Logger = logger; + OnCreated(httpRequestMessage, httpResponseMessage); + } + + /// + /// The + /// + /// + /// + /// + /// + /// + /// + /// + public ApiKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + { + Logger = logger; + OnCreated(httpRequestMessage, httpResponseMessage); + } + + partial void OnCreated(global::System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage); + + /// + /// Returns true if the response is 400 BadRequest + /// + /// + public bool IsBadRequest => 400 == (int)StatusCode; + + private void OnDeserializationErrorDefaultImplementation(Exception exception, HttpStatusCode httpStatusCode) + { + bool suppressDefaultLog = false; + OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); + if (!suppressDefaultLog) + Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + } + + partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); + } } } From df29ada912656ecac338b600fee241ed79c282c2 Mon Sep 17 00:00:00 2001 From: devhl Date: Sat, 11 Jul 2026 00:31:27 -0400 Subject: [PATCH 2/4] refactor duplicate apis --- .../main/resources/csharp/libraries/generichost/api.mustache | 2 +- .../latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs | 2 +- .../latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache index 0a36a7d59bf1..3c888ef8cf29 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache @@ -99,7 +99,7 @@ namespace {{packageName}}.{{apiPackage}} {{#-first}} /// - /// The + /// The /// {{>visibility}} interface {{interfacePrefix}}{{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse : {{#lambda.joinWithComma}}{{packageName}}.{{clientPackage}}.{{interfacePrefix}}ApiResponse {{#responses}}{{#dataType}}{{interfacePrefix}}{{vendorExtensions.x-http-status}}<{{#isModel}}{{^containerType}}{{packageName}}.{{modelPackage}}.{{/containerType}}{{/isModel}}{{{dataType}}}{{#nrt}}?{{/nrt}}{{^nrt}}{{#vendorExtensions.x-is-value-type}}?{{/vendorExtensions.x-is-value-type}}{{/nrt}}> {{/dataType}}{{/responses}}{{/lambda.joinWithComma}} { diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs index d19dd1adacb2..477ab3d6af46 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs @@ -62,7 +62,7 @@ public interface IAPIKeysApi : IApi } /// - /// The + /// The /// public interface IAPIKeysApiGetApiKeysIdApiResponse : Org.OpenAPITools.Client.IApiResponse { diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs index 3fe1cad70732..2b81736c514a 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs @@ -62,7 +62,7 @@ public interface IApiKeysApi : IApi } /// - /// The + /// The /// public interface IApiKeysApiGetApiKeysIdApiResponse : Org.OpenAPITools.Client.IApiResponse { From 39fba4b6b99db9875972d3702bb7c9e0ac600cda Mon Sep 17 00:00:00 2001 From: devhl Date: Sat, 11 Jul 2026 15:09:25 -0400 Subject: [PATCH 3/4] refactor logging --- .../languages/AbstractCSharpCodegen.java | 4 + .../languages/CSharpClientCodegen.java | 3 + .../templating/mustache/CacheLambda.java | 92 ++++++ .../templating/mustache/RecallLambda.java | 59 ++++ ...terOperationDefaultImplementation.mustache | 2 +- .../OnDeserializationError.mustache | 2 +- .../OnErrorDefaultImplementation.mustache | 2 +- .../generichost/RestLogEvents.mustache | 13 + .../csharp/libraries/generichost/api.mustache | 28 +- .../ComposedEnum/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../HelloWorld/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../InlineEnumAnyOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../latest/NullTypes/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../latest/OneOfList/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../latest/Tags/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/APIKEYSApi.cs | 26 +- .../src/Org.OpenAPITools/Api/APIKeys0Api.cs | 26 +- .../src/Org.OpenAPITools/Api/ApiKeys1Api.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net10/AllOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net10/AnyOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../AnyOfNoCompare/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net10/FormModels/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net10/OneOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net10/Petstore/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../SourceGeneration/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net4.7/AllOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net4.7/AnyOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../AnyOfNoCompare/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../FormModels/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net4.7/OneOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net4.7/Petstore/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net4.8/AllOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net4.8/AnyOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../AnyOfNoCompare/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../FormModels/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net4.8/OneOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net4.8/Petstore/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net8/AllOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net8/AnyOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../AnyOfNoCompare/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net8/FormModels/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net8/OneOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net8/Petstore/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../SourceGeneration/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net9/AllOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net9/AnyOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../AnyOfNoCompare/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net9/FormModels/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net9/OneOf/.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../net9/Petstore/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../SourceGeneration/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../.openapi-generator/FILES | 1 + .../src/Org.OpenAPITools/Api/DefaultApi.cs | 26 +- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + .../Petstore/.openapi-generator/FILES | 1 + .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 26 +- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 101 +++--- .../src/Org.OpenAPITools/Api/FakeApi.cs | 311 ++++++++---------- .../Api/FakeClassnameTags123Api.cs | 26 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 161 ++++----- .../src/Org.OpenAPITools/Api/StoreApi.cs | 71 ++-- .../src/Org.OpenAPITools/Api/UserApi.cs | 131 ++++---- .../Org.OpenAPITools/Logging/RestLogEvents.cs | 13 + 265 files changed, 7872 insertions(+), 8737 deletions(-) create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CacheLambda.java create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/RecallLambda.java create mode 100644 modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RestLogEvents.mustache create mode 100644 samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs create mode 100644 samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index b8a01b73aa0e..292fc4b35624 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -435,6 +435,7 @@ public void execute(Template.Fragment fragment, Writer writer) throws IOExceptio @Override protected ImmutableMap.Builder addMustacheLambdas() { final CopyContent copyContent = new CopyContent(); + final CacheLambda.CacheContent cacheContent = new CacheLambda.CacheContent(); return super.addMustacheLambdas() .put("camelcase_sanitize_param", new CamelCaseAndSanitizeLambda().generator(this).escapeAsParamName(true)) @@ -454,6 +455,9 @@ protected ImmutableMap.Builder addMustacheLambdas() { .put("copyText", new CopyLambda(copyContent, WhiteSpaceStrategy.Strip, WhiteSpaceStrategy.StripLineBreakIfPresent)) .put("paste", new PasteLambda(copyContent, false)) .put("pasteOnce", new PasteLambda(copyContent, true)) + .put("cache", new CacheLambda(cacheContent)) + .put("recall", new RecallLambda(cacheContent, false)) + .put("recallOnce", new RecallLambda(cacheContent, true)) .put("uniqueLines", new UniqueLambda("\n", false)) .put("unique", new UniqueLambda("\n", true)) .put("camel_case", new CamelCaseLambda()) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java index 75f3bc4c79eb..1b21310855d9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java @@ -1143,6 +1143,9 @@ public void addGenericHostSupportingFiles(final String clientPackageDir, final S supportingFiles.add(new SupportingFile("IApi.mustache", sourceFolder + File.separator + packageName + File.separator + apiPackage(), getInterfacePrefix() + "Api.cs")); + String loggingFolder = sourceFolder + File.separator + packageName + File.separator + "Logging"; + supportingFiles.add(new SupportingFile("libraries" + File.separator + GENERICHOST + File.separator + "RestLogEvents.mustache", loggingFolder, "RestLogEvents.cs")); + // extensions String extensionsFolder = sourceFolder + File.separator + packageName + File.separator + "Extensions"; supportingFiles.add(new SupportingFile("IHttpClientBuilderExtensions.mustache", extensionsFolder, "IHttpClientBuilderExtensions.cs")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CacheLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CacheLambda.java new file mode 100644 index 000000000000..641f60ccfa61 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/CacheLambda.java @@ -0,0 +1,92 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openapitools.codegen.templating.mustache; + +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template.Fragment; + +import java.io.IOException; +import java.io.Writer; +import java.util.HashMap; +import java.util.Map; + +/** + * Caches rendered text by key. + * + * Syntax: + * {{#cacheScope}}key|rendered text{{/cacheScope}} + */ +public class CacheLambda implements Mustache.Lambda { + public static class CacheContent { + public final Map contentByKey = new HashMap<>(); + } + + private final CacheContent cacheContent; + + public CacheLambda(CacheContent cacheContent) { + this.cacheContent = cacheContent; + } + + @Override + public void execute(Fragment fragment, Writer writer) throws IOException { + String content = fragment.execute(); + + // Accept either "key|content" or a multiline form where the first line is the key. + int separatorIndex = content.indexOf('|'); + if (separatorIndex < 0) { + int lineBreakIndex = findFirstLineBreakIndex(content); + if (lineBreakIndex >= 0) { + separatorIndex = lineBreakIndex; + } + } + + if (separatorIndex < 0) { + throw new IllegalArgumentException("cacheScope requires 'key|content' or 'key\\ncontent'"); + } + + String key = content.substring(0, separatorIndex).trim(); + if (key.isEmpty()) { + throw new IllegalArgumentException("cacheScope key cannot be empty"); + } + + int contentStartIndex = separatorIndex + 1; + // For CRLF, skip both '\r' and '\n'. For LF-only/CR-only, skip just one character. + if (separatorIndex < content.length() && content.charAt(separatorIndex) == '\r') { + if (contentStartIndex < content.length() && content.charAt(contentStartIndex) == '\n') { + contentStartIndex++; + } + } + + this.cacheContent.contentByKey.put(key, content.substring(contentStartIndex)); + } + + private int findFirstLineBreakIndex(String content) { + // Keep this simple and cross-platform by checking all common line endings. + int unix = content.indexOf('\n'); + int windows = content.indexOf('\r'); + + if (unix < 0) { + return windows; + } + + if (windows < 0) { + return unix; + } + + return Math.min(unix, windows); + } +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/RecallLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/RecallLambda.java new file mode 100644 index 000000000000..c2be60f34271 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/RecallLambda.java @@ -0,0 +1,59 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openapitools.codegen.templating.mustache; + +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template.Fragment; +import org.openapitools.codegen.templating.mustache.CacheLambda.CacheContent; + +import java.io.IOException; +import java.io.Writer; + +/** + * Writes rendered text that was previously cached by key. + * + * Syntax: + * {{#recallScope}}key{{/recallScope}} + */ +public class RecallLambda implements Mustache.Lambda { + private final CacheContent cacheContent; + private final boolean clear; + + public RecallLambda(CacheContent cacheContent, boolean clear) { + this.cacheContent = cacheContent; + this.clear = clear; + } + + @Override + public void execute(Fragment fragment, Writer writer) throws IOException { + String key = fragment.execute().trim(); + if (key.isEmpty()) { + throw new IllegalArgumentException("recallScope key cannot be empty"); + } + + String content = this.cacheContent.contentByKey.get(key); + if (content == null) { + return; + } + + if (this.clear) { + this.cacheContent.contentByKey.remove(key); + } + + writer.write(content); + } +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AfterOperationDefaultImplementation.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AfterOperationDefaultImplementation.mustache index bf6688605205..c55f302b220e 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AfterOperationDefaultImplementation.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AfterOperationDefaultImplementation.mustache @@ -1,2 +1,2 @@ if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OnDeserializationError.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OnDeserializationError.mustache index ff83a5076c67..43ed983a6ff3 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OnDeserializationError.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OnDeserializationError.mustache @@ -1,2 +1,2 @@ if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); \ No newline at end of file + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OnErrorDefaultImplementation.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OnErrorDefaultImplementation.mustache index a1a9fa976f58..7e7166c4a0af 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OnErrorDefaultImplementation.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/OnErrorDefaultImplementation.mustache @@ -1,2 +1,2 @@ if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); \ No newline at end of file + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RestLogEvents.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RestLogEvents.mustache new file mode 100644 index 000000000000..c46dc2682d49 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RestLogEvents.mustache @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace {{packageName}}.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache index 3c888ef8cf29..101466f247ad 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache @@ -28,6 +28,7 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Text.Json; using {{packageName}}.{{clientPackage}}; +using {{packageName}}.Logging; {{#hasImport}} using {{packageName}}.{{modelPackage}}; {{/hasImport}} @@ -165,11 +166,6 @@ namespace {{packageName}}.{{apiPackage}} { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -227,7 +223,7 @@ namespace {{packageName}}.{{apiPackage}} /// Initializes a new instance of the class. /// /// - public {{classname}}(ILogger<{{classname}}> logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, {{classname}}Events {{#lambda.camelcase_sanitize_param}}{{classname}}Events{{/lambda.camelcase_sanitize_param}}{{#hasApiKeyMethods}}, + public {{classname}}(ILogger<{{classname}}> logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, {{classname}}Events {{#lambda.camelcase_sanitize_param}}{{classname}}Events{{/lambda.camelcase_sanitize_param}}{{#hasApiKeyMethods}}, TokenProvider apiKeyProvider{{/hasApiKeyMethods}}{{#hasHttpBearerMethods}}, TokenProvider bearerTokenProvider{{/hasHttpBearerMethods}}{{#hasHttpBasicMethods}}, TokenProvider basicTokenProvider{{/hasHttpBasicMethods}}{{#hasHttpSignatureMethods}}, @@ -236,8 +232,7 @@ namespace {{packageName}}.{{apiPackage}} {{packageName}}.{{clientPackage}}.CookieContainer cookieContainer{{/vendorExtensions.x-set-cookie}}{{/lambda.uniqueLines}}{{/operation}}{{/net80OrLater}}) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger<{{classname}}>(); + Logger = logger; HttpClient = httpClient; Events = {{#lambda.camelcase_sanitize_param}}{{classname}}Events{{/lambda.camelcase_sanitize_param}};{{#hasApiKeyMethods}} ApiKeyProvider = apiKeyProvider;{{/hasApiKeyMethods}}{{#hasHttpBearerMethods}} @@ -721,7 +716,6 @@ namespace {{packageName}}.{{apiPackage}} using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger<{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse> apiResponseLoggerLocalVar = LoggerFactory.CreateLogger<{{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse>(); {{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { @@ -736,7 +730,7 @@ namespace {{packageName}}.{{apiPackage}} { byte[] responseBytesArrayLocalVar = await httpResponseMessageLocalVar.Content.ReadAsByteArrayAsync({{#net60OrLater}}cancellationToken{{/net60OrLater}}).ConfigureAwait(false); System.IO.Stream responseContentStreamLocalVar = new System.IO.MemoryStream(responseBytesArrayLocalVar); - apiResponseLocalVar = new{{^net60OrLater}} {{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse{{/net60OrLater}}(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentStreamLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new{{^net60OrLater}} {{operationId}}ApiResponse{{/net60OrLater}}(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentStreamLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -745,7 +739,7 @@ namespace {{packageName}}.{{apiPackage}} {{/responses}} default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync({{#net60OrLater}}cancellationToken{{/net60OrLater}}).ConfigureAwait(false); - apiResponseLocalVar = new{{^net60OrLater}} {{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse{{/net60OrLater}}(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new{{^net60OrLater}} {{operationId}}ApiResponse{{/net60OrLater}}(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -815,6 +809,12 @@ namespace {{packageName}}.{{apiPackage}} {{/vendorExtensions.x-duplicates}} {{/lambda.trim}} {{/lambda.copy}} + {{#lambda.cache}} + classname + {{#lambda.trim}} + {{classname}} + {{/lambda.trim}} + {{/lambda.cache}} {{#responses}} {{#-first}} @@ -826,7 +826,7 @@ namespace {{packageName}}.{{apiPackage}} /// /// The logger /// - public ILogger<{{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse> Logger { get; } + public ILogger<{{#lambda.recall}}classname{{/lambda.recall}}> Logger { get; } /// /// The @@ -838,7 +838,7 @@ namespace {{packageName}}.{{apiPackage}} /// /// /// - public {{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse(ILogger<{{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse> logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public {{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse(ILogger<{{classname}}> logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -854,7 +854,7 @@ namespace {{packageName}}.{{apiPackage}} /// /// /// - public {{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse(ILogger<{{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse> logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public {{#lambda.paste}}{{/lambda.paste}}{{operationId}}ApiResponse(ILogger<{{classname}}> logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES index 088165b19c1d..e496483f4842 100644 --- a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/.openapi-generator/FILES @@ -34,6 +34,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/AreaCode.cs src/Org.OpenAPITools/Model/MarineAreaCode.cs src/Org.OpenAPITools/Model/StateTerritoryCode.cs diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/HelloWorld/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/latest/HelloWorld/.openapi-generator/FILES index 7e49740eadbb..7ef3eb1629a8 100644 --- a/samples/client/petstore/csharp/generichost/latest/HelloWorld/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/latest/HelloWorld/.openapi-generator/FILES @@ -34,6 +34,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/HelloWorldPostRequest.cs src/Org.OpenAPITools/Org.OpenAPITools.csproj src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs index 886510d697ba..49af83757d9c 100644 --- a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -112,11 +113,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -136,11 +132,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -168,7 +163,7 @@ private void AfterHelloWorldPostDefaultImplementation(IHelloWorldPostApiResponse bool suppressDefaultLog = false; AfterHelloWorldPost(ref suppressDefaultLog, apiResponseLocalVar, helloWorldPostRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -191,7 +186,7 @@ private void OnErrorHelloWorldPostDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorHelloWorldPost(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, helloWorldPostRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -272,13 +267,12 @@ public async Task HelloWorldPostAsync(Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloWorldPostApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/helloWorld", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/helloWorld", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -308,7 +302,7 @@ public partial class HelloWorldPostApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -320,7 +314,7 @@ public partial class HelloWorldPostApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public HelloWorldPostApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloWorldPostApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -336,7 +330,7 @@ public HelloWorldPostApiResponse(ILogger logger, Syst /// /// /// - public HelloWorldPostApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloWorldPostApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -361,7 +355,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/.openapi-generator/FILES index 7c3137c1b51f..385311897f95 100644 --- a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/.openapi-generator/FILES @@ -37,6 +37,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Foo.cs src/Org.OpenAPITools/Model/IconsDefaultResponse.cs src/Org.OpenAPITools/Model/IconsSizeParameter.cs diff --git a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 5e725e10b2e3..d408281d2470 100644 --- a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -130,11 +126,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -162,7 +157,7 @@ private void AfterIconsDefaultImplementation(IIconsApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterIcons(ref suppressDefaultLog, apiResponseLocalVar, size); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -185,7 +180,7 @@ private void OnErrorIconsDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorIcons(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, size); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -266,13 +261,12 @@ public async Task IconsAsync(Option size using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); IconsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/icons", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/icons", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -302,7 +296,7 @@ public partial class IconsApiResponse : Org.OpenAPITools.Client.ApiResponse, IIc /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -314,7 +308,7 @@ public partial class IconsApiResponse : Org.OpenAPITools.Client.ApiResponse, IIc /// /// /// - public IconsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public IconsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -330,7 +324,7 @@ public IconsApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public IconsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public IconsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -381,7 +375,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/NullTypes/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/latest/NullTypes/.openapi-generator/FILES index a22bf283cb97..eaa9a1f15622 100644 --- a/samples/client/petstore/csharp/generichost/latest/NullTypes/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/latest/NullTypes/.openapi-generator/FILES @@ -39,6 +39,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Color.cs src/Org.OpenAPITools/Model/ColorOrNull.cs src/Org.OpenAPITools/Model/NullTypeDirect.cs diff --git a/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Api/DefaultApi.cs index 1d213960b8ce..5aad136fc38b 100644 --- a/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -112,11 +113,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -136,11 +132,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -157,7 +152,7 @@ private void AfterGetWidgetDefaultImplementation(IGetWidgetApiResponse apiRespon bool suppressDefaultLog = false; AfterGetWidget(ref suppressDefaultLog, apiResponseLocalVar, id); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -180,7 +175,7 @@ private void OnErrorGetWidgetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetWidget(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, id); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -253,13 +248,12 @@ public async Task GetWidgetAsync(long id, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetWidgetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/widgets/{id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/widgets/{id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -289,7 +283,7 @@ public partial class GetWidgetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -301,7 +295,7 @@ public partial class GetWidgetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public GetWidgetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetWidgetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -317,7 +311,7 @@ public GetWidgetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public GetWidgetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetWidgetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -374,7 +368,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/OneOfList/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/latest/OneOfList/.openapi-generator/FILES index 54155a05db81..62b5d1840b64 100644 --- a/samples/client/petstore/csharp/generichost/latest/OneOfList/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/latest/OneOfList/.openapi-generator/FILES @@ -35,6 +35,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/OneOfArrayRequest.cs src/Org.OpenAPITools/Model/TestObject.cs src/Org.OpenAPITools/Org.OpenAPITools.csproj diff --git a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs index 6c73040ca3cb..83ae7891ddb3 100644 --- a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -130,11 +126,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -151,7 +146,7 @@ private void AfterOneOfArrayDefaultImplementation(IOneOfArrayApiResponse apiResp bool suppressDefaultLog = false; AfterOneOfArray(ref suppressDefaultLog, apiResponseLocalVar, oneOfArrayRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -174,7 +169,7 @@ private void OnErrorOneOfArrayDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorOneOfArray(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, oneOfArrayRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -253,13 +248,12 @@ public async Task OneOfArrayAsync(Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); OneOfArrayApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/one-of-array", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/one-of-array", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -289,7 +283,7 @@ public partial class OneOfArrayApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -301,7 +295,7 @@ public partial class OneOfArrayApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public OneOfArrayApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public OneOfArrayApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -317,7 +311,7 @@ public OneOfArrayApiResponse(ILogger logger, System.Net.H /// /// /// - public OneOfArrayApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public OneOfArrayApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -336,7 +330,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/latest/Tags/.openapi-generator/FILES index 27397861417c..dcf591f477dc 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/latest/Tags/.openapi-generator/FILES @@ -38,5 +38,6 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Org.OpenAPITools.csproj src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKEYSApi.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKEYSApi.cs index 7ca4bb0789ed..06e022ed99a8 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKEYSApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKEYSApi.cs @@ -22,6 +22,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using System.Diagnostics.CodeAnalysis; namespace Org.OpenAPITools.Api @@ -106,11 +107,6 @@ public sealed partial class APIKEYSApi : IAPIKEYSApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -135,12 +131,11 @@ public sealed partial class APIKEYSApi : IAPIKEYSApi /// Initializes a new instance of the class. /// /// - public APIKEYSApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, APIKEYSApiEvents aPIKEYSApiEvents, + public APIKEYSApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, APIKEYSApiEvents aPIKEYSApiEvents, TokenProvider apiKeyProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = aPIKEYSApiEvents; ApiKeyProvider = apiKeyProvider; @@ -158,7 +153,7 @@ private void AfterGetApiKeysIdDefaultImplementation(IGetApiKeysIdApiResponse api bool suppressDefaultLog = false; AfterGetApiKeysId(ref suppressDefaultLog, apiResponseLocalVar, id); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -181,7 +176,7 @@ private void OnErrorGetApiKeysIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetApiKeysId(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, id); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -245,13 +240,12 @@ public async Task GetApiKeysIdAsync(int id, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetApiKeysIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -281,7 +275,7 @@ public partial class GetApiKeysIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -293,7 +287,7 @@ public partial class GetApiKeysIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -309,7 +303,7 @@ public GetApiKeysIdApiResponse(ILogger logger, System.N /// /// /// - public GetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -328,7 +322,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs index 477ab3d6af46..477a4fc04ff4 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/APIKeys0Api.cs @@ -22,6 +22,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using System.Diagnostics.CodeAnalysis; namespace Org.OpenAPITools.Api @@ -106,11 +107,6 @@ public sealed partial class APIKeysApi : IAPIKeysApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -135,12 +131,11 @@ public sealed partial class APIKeysApi : IAPIKeysApi /// Initializes a new instance of the class. /// /// - public APIKeysApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, APIKeysApiEvents aPIKeysApiEvents, + public APIKeysApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, APIKeysApiEvents aPIKeysApiEvents, TokenProvider apiKeyProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = aPIKeysApiEvents; ApiKeyProvider = apiKeyProvider; @@ -158,7 +153,7 @@ private void AfterGetApiKeysIdDefaultImplementation(IAPIKeysApiGetApiKeysIdApiRe bool suppressDefaultLog = false; AfterGetApiKeysId(ref suppressDefaultLog, apiResponseLocalVar, id); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -181,7 +176,7 @@ private void OnErrorGetApiKeysIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetApiKeysId(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, id); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -245,13 +240,12 @@ public async Task GetApiKeysIdAsync(int id, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); APIKeysApiGetApiKeysIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -281,7 +275,7 @@ public partial class APIKeysApiGetApiKeysIdApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -293,7 +287,7 @@ public partial class APIKeysApiGetApiKeysIdApiResponse : Org.OpenAPITools.Client /// /// /// - public APIKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public APIKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -309,7 +303,7 @@ public APIKeysApiGetApiKeysIdApiResponse(ILogger /// /// - public APIKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public APIKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -328,7 +322,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs index 2b81736c514a..c54518ee13cd 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Api/ApiKeys1Api.cs @@ -22,6 +22,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using System.Diagnostics.CodeAnalysis; namespace Org.OpenAPITools.Api @@ -106,11 +107,6 @@ public sealed partial class ApiKeysApi : IApiKeysApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -135,12 +131,11 @@ public sealed partial class ApiKeysApi : IApiKeysApi /// Initializes a new instance of the class. /// /// - public ApiKeysApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, ApiKeysApiEvents apiKeysApiEvents, + public ApiKeysApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, ApiKeysApiEvents apiKeysApiEvents, TokenProvider apiKeyProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = apiKeysApiEvents; ApiKeyProvider = apiKeyProvider; @@ -158,7 +153,7 @@ private void AfterGetApiKeysIdDefaultImplementation(IApiKeysApiGetApiKeysIdApiRe bool suppressDefaultLog = false; AfterGetApiKeysId(ref suppressDefaultLog, apiResponseLocalVar, id); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -181,7 +176,7 @@ private void OnErrorGetApiKeysIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetApiKeysId(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, id); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -245,13 +240,12 @@ public async Task GetApiKeysIdAsync(int id, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); ApiKeysApiGetApiKeysIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/api_keys/{id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -281,7 +275,7 @@ public partial class ApiKeysApiGetApiKeysIdApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -293,7 +287,7 @@ public partial class ApiKeysApiGetApiKeysIdApiResponse : Org.OpenAPITools.Client /// /// /// - public ApiKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public ApiKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -309,7 +303,7 @@ public ApiKeysApiGetApiKeysIdApiResponse(ILogger /// /// - public ApiKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public ApiKeysApiGetApiKeysIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -328,7 +322,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/.openapi-generator/FILES index a3e02b328e0a..3a66c0df35db 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/.openapi-generator/FILES @@ -154,6 +154,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 04b8da36fe38..8c27696f8420 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -307,13 +302,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -343,7 +337,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -355,7 +349,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -371,7 +365,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -422,7 +416,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/DefaultApi.cs index 23e4f720a4b2..00f9455abbba 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -377,11 +378,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -426,7 +422,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -434,8 +430,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -454,7 +449,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -475,7 +470,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -542,13 +537,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -578,7 +572,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -590,7 +584,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -606,7 +600,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -657,7 +651,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -686,7 +680,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -709,7 +703,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -785,13 +779,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -821,7 +814,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -833,7 +826,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -849,7 +842,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -868,7 +861,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -883,7 +876,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -904,7 +897,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -971,13 +964,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1007,7 +999,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1019,7 +1011,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1035,7 +1027,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1086,7 +1078,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1101,7 +1093,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1122,7 +1114,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1189,13 +1181,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1225,7 +1216,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1237,7 +1228,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1253,7 +1244,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1310,7 +1301,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1325,7 +1316,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1346,7 +1337,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1413,13 +1404,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1449,7 +1439,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1461,7 +1451,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1477,7 +1467,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1528,7 +1518,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1543,7 +1533,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1564,7 +1554,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1631,13 +1621,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1667,7 +1656,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1679,7 +1668,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1695,7 +1684,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1746,7 +1735,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeApi.cs index 237406dab61f..48dec80ea059 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1227,11 +1228,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1276,7 +1272,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1284,8 +1280,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1304,7 +1299,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1325,7 +1320,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1392,13 +1387,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1428,7 +1422,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1440,7 +1434,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1456,7 +1450,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1507,7 +1501,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1519,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1542,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1636,13 +1630,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1672,7 +1665,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1684,7 +1677,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1700,7 +1693,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1751,7 +1744,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1780,7 +1773,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1803,7 +1796,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1893,13 +1886,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1929,7 +1921,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1941,7 +1933,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1957,7 +1949,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2008,7 +2000,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2026,7 +2018,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2049,7 +2041,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2137,13 +2129,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2173,7 +2164,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2185,7 +2176,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2201,7 +2192,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2252,7 +2243,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2282,7 +2273,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2307,7 +2298,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2406,13 +2397,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2442,7 +2432,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2454,7 +2444,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2470,7 +2460,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2521,7 +2511,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2536,7 +2526,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2557,7 +2547,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2624,13 +2614,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2660,7 +2649,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2672,7 +2661,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2688,7 +2677,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2739,7 +2728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2754,7 +2743,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2775,7 +2764,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2842,13 +2831,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2878,7 +2866,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2890,7 +2878,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2906,7 +2894,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2957,7 +2945,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2972,7 +2960,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2993,7 +2981,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3060,13 +3048,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3096,7 +3083,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3108,7 +3095,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3124,7 +3111,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3175,7 +3162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3204,7 +3191,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3227,7 +3214,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3305,13 +3292,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3341,7 +3327,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3353,7 +3339,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3369,7 +3355,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3388,7 +3374,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3417,7 +3403,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3440,7 +3426,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3518,13 +3504,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3554,7 +3539,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3566,7 +3551,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3582,7 +3567,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3601,7 +3586,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3635,7 +3620,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3660,7 +3645,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3747,13 +3732,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3783,7 +3767,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3795,7 +3779,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3811,7 +3795,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3830,7 +3814,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3859,7 +3843,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3882,7 +3866,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3969,13 +3953,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4005,7 +3988,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4017,7 +4000,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4033,7 +4016,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4084,7 +4067,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4146,7 +4129,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4195,7 +4178,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4353,13 +4336,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4393,7 +4375,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4405,7 +4387,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4421,7 +4403,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4446,7 +4428,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4502,7 +4484,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4539,7 +4521,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4682,13 +4664,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4718,7 +4699,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4730,7 +4711,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4746,7 +4727,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4771,7 +4752,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4794,7 +4775,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4827,7 +4808,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4948,13 +4929,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4988,7 +4968,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5000,7 +4980,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5016,7 +4996,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5035,7 +5015,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5064,7 +5044,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5087,7 +5067,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5165,13 +5145,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5201,7 +5180,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5213,7 +5192,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5229,7 +5208,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5248,7 +5227,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5277,7 +5256,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5300,7 +5279,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5378,13 +5357,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5414,7 +5392,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5426,7 +5404,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5442,7 +5420,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5461,7 +5439,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5495,7 +5473,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5520,7 +5498,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5601,13 +5579,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5637,7 +5614,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5649,7 +5626,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5665,7 +5642,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5684,7 +5661,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5745,7 +5722,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5784,7 +5761,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5891,13 +5868,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5927,7 +5903,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5939,7 +5915,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5955,7 +5931,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5974,7 +5950,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -6003,7 +5979,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6026,7 +6002,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6104,13 +6080,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6140,7 +6115,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6152,7 +6127,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6168,7 +6143,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6187,7 +6162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 980b7a0c1f89..19201e6173a3 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -316,13 +311,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -356,7 +350,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -368,7 +362,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -384,7 +378,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -435,7 +429,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/PetApi.cs index 9d06e1ac4a9e..79331ea4b0ef 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/PetApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -667,11 +668,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -716,7 +712,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -724,8 +720,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -758,7 +753,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -781,7 +776,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -881,13 +876,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -921,7 +915,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -933,7 +927,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -949,7 +943,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +962,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -998,7 +992,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1023,7 +1017,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1112,13 +1106,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1152,7 +1145,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1164,7 +1157,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1180,7 +1173,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1199,7 +1192,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1228,7 +1221,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1251,7 +1244,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1349,13 +1342,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1389,7 +1381,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1401,7 +1393,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1417,7 +1409,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1500,7 +1492,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1529,7 +1521,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1552,7 +1544,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1650,13 +1642,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1690,7 +1681,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1702,7 +1693,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1718,7 +1709,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1775,7 +1766,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1793,7 +1784,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1816,7 +1807,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1903,13 +1894,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1943,7 +1933,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1955,7 +1945,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1971,7 +1961,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2034,7 +2024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2063,7 +2053,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2086,7 +2076,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2180,13 +2170,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2220,7 +2209,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2232,7 +2221,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2248,7 +2237,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2279,7 +2268,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2314,7 +2303,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2341,7 +2330,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2435,13 +2424,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2475,7 +2463,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2487,7 +2475,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2503,7 +2491,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2522,7 +2510,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2557,7 +2545,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2584,7 +2572,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2695,13 +2683,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2735,7 +2722,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2747,7 +2734,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2763,7 +2750,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2814,7 +2801,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2849,7 +2836,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2876,7 +2863,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2987,13 +2974,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3027,7 +3013,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3039,7 +3025,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3055,7 +3041,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3106,7 +3092,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3136,7 +3122,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3161,7 +3147,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3266,13 +3252,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3306,7 +3291,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3318,7 +3303,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3334,7 +3319,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3385,7 +3370,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/StoreApi.cs index 08624b36f6ad..a91b3566ff25 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/StoreApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -293,11 +294,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -342,7 +338,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -350,8 +346,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -384,7 +379,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -407,7 +402,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -473,13 +468,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -509,7 +503,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -521,7 +515,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -537,7 +531,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -562,7 +556,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -577,7 +571,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -598,7 +592,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -670,13 +664,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -710,7 +703,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -722,7 +715,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -738,7 +731,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +782,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -807,7 +800,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -830,7 +823,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -904,13 +897,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -940,7 +932,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -952,7 +944,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +960,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1052,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1075,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1171,13 +1163,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1207,7 +1198,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1219,7 +1210,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1235,7 +1226,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1292,7 +1283,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/UserApi.cs index c8536386fafb..278b5313c81f 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Api/UserApi.cs @@ -22,6 +22,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -536,11 +537,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -590,7 +586,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -599,8 +595,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -634,7 +629,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -657,7 +652,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -735,13 +730,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -771,7 +765,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -783,7 +777,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -799,7 +793,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -818,7 +812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -847,7 +841,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -870,7 +864,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -948,13 +942,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -984,7 +977,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -996,7 +989,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1012,7 +1005,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1053,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1076,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1161,13 +1154,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1197,7 +1189,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1209,7 +1201,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1225,7 +1217,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1244,7 +1236,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1273,7 +1265,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1296,7 +1288,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1362,13 +1354,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1398,7 +1389,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1410,7 +1401,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1426,7 +1417,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1451,7 +1442,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1480,7 +1471,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1503,7 +1494,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1579,13 +1570,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1627,7 +1617,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1643,7 +1633,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1750,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1784,7 +1774,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1809,7 +1799,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1894,13 +1884,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1957,7 +1946,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1969,7 +1958,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1985,7 +1974,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2042,7 +2031,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2046,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2078,7 +2067,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2136,13 +2125,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2172,7 +2160,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2184,7 +2172,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2200,7 +2188,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2219,7 +2207,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2253,7 +2241,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2278,7 +2266,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2360,13 +2348,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2396,7 +2383,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2408,7 +2395,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2424,7 +2411,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2449,7 +2436,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net10/AllOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/AllOf/.openapi-generator/FILES index 46a8286dea29..e32fc0acf018 100644 --- a/samples/client/petstore/csharp/generichost/net10/AllOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net10/AllOf/.openapi-generator/FILES @@ -36,6 +36,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Adult.cs src/Org.OpenAPITools/Model/Child.cs src/Org.OpenAPITools/Model/Person.cs diff --git a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 6e510044ff6f..9df512f32a87 100644 --- a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -130,11 +126,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -162,7 +157,7 @@ private void AfterListDefaultImplementation(IListApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterList(ref suppressDefaultLog, apiResponseLocalVar, personId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -185,7 +180,7 @@ private void OnErrorListDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorList(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, personId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -260,13 +255,12 @@ public async Task ListAsync(string personId, System.Threading. using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); ListApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/person/display/{personId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/person/display/{personId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -296,7 +290,7 @@ public partial class ListApiResponse : Org.OpenAPITools.Client.ApiResponse, ILis /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -308,7 +302,7 @@ public partial class ListApiResponse : Org.OpenAPITools.Client.ApiResponse, ILis /// /// /// - public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -324,7 +318,7 @@ public ListApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -375,7 +369,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/AnyOf/.openapi-generator/FILES index 072cc8408121..470d4870ee92 100644 --- a/samples/client/petstore/csharp/generichost/net10/AnyOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net10/AnyOf/.openapi-generator/FILES @@ -36,6 +36,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 951a8589ef49..592c9c5898ef 100644 --- a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/.openapi-generator/FILES index 072cc8408121..470d4870ee92 100644 --- a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/.openapi-generator/FILES @@ -36,6 +36,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs index 951a8589ef49..592c9c5898ef 100644 --- a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES index 737d53400248..fd2691eb4794 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES @@ -179,6 +179,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 0de8a13cdbd7..4946f189d1b9 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -305,13 +300,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -341,7 +335,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -353,7 +347,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -369,7 +363,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -420,7 +414,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs index 5b43ed103210..59286835beb1 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -375,11 +376,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -424,7 +420,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -432,8 +428,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -452,7 +447,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -473,7 +468,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -540,13 +535,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -576,7 +570,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -588,7 +582,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -604,7 +598,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -655,7 +649,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -684,7 +678,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -707,7 +701,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -783,13 +777,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -819,7 +812,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -831,7 +824,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -847,7 +840,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -866,7 +859,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -881,7 +874,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -902,7 +895,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -969,13 +962,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1005,7 +997,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1017,7 +1009,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1033,7 +1025,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1084,7 +1076,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1099,7 +1091,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1120,7 +1112,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1187,13 +1179,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1223,7 +1214,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1235,7 +1226,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1251,7 +1242,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1308,7 +1299,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1323,7 +1314,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1344,7 +1335,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1411,13 +1402,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1447,7 +1437,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1459,7 +1449,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1475,7 +1465,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1526,7 +1516,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1541,7 +1531,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1562,7 +1552,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1629,13 +1619,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1665,7 +1654,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1677,7 +1666,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1693,7 +1682,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1744,7 +1733,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 6638ec4068d1..b74e8b5e7327 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1225,11 +1226,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1274,7 +1270,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1282,8 +1278,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1302,7 +1297,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1323,7 +1318,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1390,13 +1385,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1426,7 +1420,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1438,7 +1432,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1454,7 +1448,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1505,7 +1499,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1523,7 +1517,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1546,7 +1540,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1634,13 +1628,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1670,7 +1663,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1682,7 +1675,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1698,7 +1691,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1749,7 +1742,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1778,7 +1771,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1801,7 +1794,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1891,13 +1884,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1927,7 +1919,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1939,7 +1931,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1955,7 +1947,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2006,7 +1998,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2024,7 +2016,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2047,7 +2039,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2135,13 +2127,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2171,7 +2162,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2183,7 +2174,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2199,7 +2190,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2250,7 +2241,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2280,7 +2271,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2305,7 +2296,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2404,13 +2395,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2440,7 +2430,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2452,7 +2442,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2468,7 +2458,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2519,7 +2509,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2534,7 +2524,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2555,7 +2545,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2622,13 +2612,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2658,7 +2647,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2670,7 +2659,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2686,7 +2675,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2737,7 +2726,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2752,7 +2741,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2773,7 +2762,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2840,13 +2829,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2876,7 +2864,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2888,7 +2876,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2904,7 +2892,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2955,7 +2943,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2970,7 +2958,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2991,7 +2979,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3058,13 +3046,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3094,7 +3081,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3106,7 +3093,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3122,7 +3109,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3173,7 +3160,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3202,7 +3189,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3225,7 +3212,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3303,13 +3290,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3339,7 +3325,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3351,7 +3337,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3367,7 +3353,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3386,7 +3372,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3415,7 +3401,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3438,7 +3424,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3516,13 +3502,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3552,7 +3537,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3564,7 +3549,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3580,7 +3565,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3599,7 +3584,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3633,7 +3618,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3658,7 +3643,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3745,13 +3730,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3781,7 +3765,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3793,7 +3777,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3809,7 +3793,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3828,7 +3812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3857,7 +3841,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3880,7 +3864,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3967,13 +3951,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4003,7 +3986,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4015,7 +3998,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4031,7 +4014,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4082,7 +4065,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4144,7 +4127,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4193,7 +4176,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4351,13 +4334,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4391,7 +4373,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4403,7 +4385,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4419,7 +4401,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4444,7 +4426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4488,7 +4470,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4525,7 +4507,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4668,13 +4650,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4704,7 +4685,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4716,7 +4697,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4732,7 +4713,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4757,7 +4738,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4780,7 +4761,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4813,7 +4794,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4934,13 +4915,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4974,7 +4954,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4986,7 +4966,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5002,7 +4982,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5021,7 +5001,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5050,7 +5030,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5073,7 +5053,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5151,13 +5131,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5187,7 +5166,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5199,7 +5178,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5215,7 +5194,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5234,7 +5213,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5263,7 +5242,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5286,7 +5265,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5364,13 +5343,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5400,7 +5378,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5412,7 +5390,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5428,7 +5406,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5447,7 +5425,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5481,7 +5459,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5506,7 +5484,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5587,13 +5565,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5623,7 +5600,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5635,7 +5612,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5651,7 +5628,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5670,7 +5647,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5731,7 +5708,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5770,7 +5747,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5877,13 +5854,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5913,7 +5889,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5925,7 +5901,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5941,7 +5917,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5960,7 +5936,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5989,7 +5965,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6012,7 +5988,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6090,13 +6066,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6126,7 +6101,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6138,7 +6113,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6154,7 +6129,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6173,7 +6148,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 2813dbef14b7..fb834c1244ed 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -314,13 +309,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -354,7 +348,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -366,7 +360,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -382,7 +376,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -433,7 +427,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/PetApi.cs index 7a052a90d955..c636f7e6a084 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -665,11 +666,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -714,7 +710,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -722,8 +718,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -756,7 +751,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -779,7 +774,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -879,13 +874,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -919,7 +913,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -931,7 +925,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -947,7 +941,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +960,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -996,7 +990,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1021,7 +1015,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1110,13 +1104,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1150,7 +1143,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1162,7 +1155,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1178,7 +1171,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1197,7 +1190,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1226,7 +1219,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1249,7 +1242,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1347,13 +1340,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1387,7 +1379,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1399,7 +1391,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1415,7 +1407,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1498,7 +1490,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1527,7 +1519,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1550,7 +1542,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1648,13 +1640,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1688,7 +1679,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1700,7 +1691,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1716,7 +1707,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1773,7 +1764,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1791,7 +1782,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1814,7 +1805,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1901,13 +1892,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1941,7 +1931,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1953,7 +1943,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1969,7 +1959,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2032,7 +2022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2061,7 +2051,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2084,7 +2074,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2178,13 +2168,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2218,7 +2207,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2230,7 +2219,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2246,7 +2235,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2277,7 +2266,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2312,7 +2301,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2339,7 +2328,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2433,13 +2422,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2473,7 +2461,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2485,7 +2473,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2501,7 +2489,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2520,7 +2508,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2555,7 +2543,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2582,7 +2570,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2693,13 +2681,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2733,7 +2720,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2745,7 +2732,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2761,7 +2748,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2812,7 +2799,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2847,7 +2834,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2874,7 +2861,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2985,13 +2972,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3025,7 +3011,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3037,7 +3023,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3053,7 +3039,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3104,7 +3090,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3134,7 +3120,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3159,7 +3145,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3264,13 +3250,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3304,7 +3289,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3316,7 +3301,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3332,7 +3317,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3383,7 +3368,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs index f05331998ad1..3cbfda259a8b 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -291,11 +292,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -340,7 +336,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -348,8 +344,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -382,7 +377,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -405,7 +400,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -471,13 +466,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -507,7 +501,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -519,7 +513,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -535,7 +529,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -560,7 +554,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -575,7 +569,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -596,7 +590,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -668,13 +662,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -708,7 +701,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -720,7 +713,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -736,7 +729,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -787,7 +780,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -805,7 +798,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -828,7 +821,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -902,13 +895,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -938,7 +930,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -950,7 +942,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +958,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1021,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1050,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1073,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1169,13 +1161,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1205,7 +1196,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1217,7 +1208,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1233,7 +1224,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1290,7 +1281,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/UserApi.cs index ecdf56916766..097407c2d62a 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/UserApi.cs @@ -20,6 +20,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -534,11 +535,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -588,7 +584,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -597,8 +593,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -632,7 +627,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -655,7 +650,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -733,13 +728,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -769,7 +763,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -781,7 +775,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -797,7 +791,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -816,7 +810,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -845,7 +839,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -868,7 +862,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -946,13 +940,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -982,7 +975,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -994,7 +987,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1010,7 +1003,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1051,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1074,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1159,13 +1152,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1195,7 +1187,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1207,7 +1199,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1223,7 +1215,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1242,7 +1234,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1271,7 +1263,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1294,7 +1286,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1360,13 +1352,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1396,7 +1387,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1408,7 +1399,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1424,7 +1415,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1449,7 +1440,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1478,7 +1469,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1501,7 +1492,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1577,13 +1568,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1613,7 +1603,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1625,7 +1615,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1641,7 +1631,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1748,7 +1738,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1782,7 +1772,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1807,7 +1797,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1892,13 +1882,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1955,7 +1944,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1967,7 +1956,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1983,7 +1972,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2040,7 +2029,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2055,7 +2044,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2076,7 +2065,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2134,13 +2123,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2170,7 +2158,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2182,7 +2170,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2198,7 +2186,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2217,7 +2205,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2251,7 +2239,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2276,7 +2264,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2358,13 +2346,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2394,7 +2381,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2406,7 +2393,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2422,7 +2409,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2447,7 +2434,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/.openapi-generator/FILES index a3e02b328e0a..3a66c0df35db 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/.openapi-generator/FILES @@ -154,6 +154,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 04b8da36fe38..8c27696f8420 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -307,13 +302,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -343,7 +337,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -355,7 +349,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -371,7 +365,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -422,7 +416,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs index 23e4f720a4b2..00f9455abbba 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -377,11 +378,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -426,7 +422,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -434,8 +430,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -454,7 +449,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -475,7 +470,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -542,13 +537,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -578,7 +572,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -590,7 +584,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -606,7 +600,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -657,7 +651,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -686,7 +680,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -709,7 +703,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -785,13 +779,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -821,7 +814,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -833,7 +826,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -849,7 +842,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -868,7 +861,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -883,7 +876,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -904,7 +897,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -971,13 +964,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1007,7 +999,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1019,7 +1011,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1035,7 +1027,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1086,7 +1078,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1101,7 +1093,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1122,7 +1114,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1189,13 +1181,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1225,7 +1216,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1237,7 +1228,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1253,7 +1244,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1310,7 +1301,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1325,7 +1316,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1346,7 +1337,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1413,13 +1404,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1449,7 +1439,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1461,7 +1451,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1477,7 +1467,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1528,7 +1518,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1543,7 +1533,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1564,7 +1554,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1631,13 +1621,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1667,7 +1656,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1679,7 +1668,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1695,7 +1684,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1746,7 +1735,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs index 9242390191ce..3e7893ff2380 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1227,11 +1228,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1276,7 +1272,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1284,8 +1280,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1304,7 +1299,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1325,7 +1320,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1392,13 +1387,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1428,7 +1422,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1440,7 +1434,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1456,7 +1450,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1507,7 +1501,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1519,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1542,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1636,13 +1630,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1672,7 +1665,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1684,7 +1677,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1700,7 +1693,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1751,7 +1744,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1780,7 +1773,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1803,7 +1796,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1893,13 +1886,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1929,7 +1921,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1941,7 +1933,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1957,7 +1949,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2008,7 +2000,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2026,7 +2018,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2049,7 +2041,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2137,13 +2129,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2173,7 +2164,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2185,7 +2176,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2201,7 +2192,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2252,7 +2243,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2282,7 +2273,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2307,7 +2298,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2406,13 +2397,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2442,7 +2432,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2454,7 +2444,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2470,7 +2460,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2521,7 +2511,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2536,7 +2526,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2557,7 +2547,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2624,13 +2614,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2660,7 +2649,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2672,7 +2661,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2688,7 +2677,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2739,7 +2728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2754,7 +2743,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2775,7 +2764,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2842,13 +2831,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2878,7 +2866,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2890,7 +2878,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2906,7 +2894,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2957,7 +2945,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2972,7 +2960,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2993,7 +2981,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3060,13 +3048,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3096,7 +3083,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3108,7 +3095,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3124,7 +3111,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3175,7 +3162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3204,7 +3191,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3227,7 +3214,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3305,13 +3292,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3341,7 +3327,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3353,7 +3339,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3369,7 +3355,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3388,7 +3374,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3417,7 +3403,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3440,7 +3426,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3518,13 +3504,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3554,7 +3539,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3566,7 +3551,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3582,7 +3567,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3601,7 +3586,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3635,7 +3620,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3660,7 +3645,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3747,13 +3732,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3783,7 +3767,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3795,7 +3779,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3811,7 +3795,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3830,7 +3814,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3859,7 +3843,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3882,7 +3866,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3969,13 +3953,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4005,7 +3988,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4017,7 +4000,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4033,7 +4016,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4084,7 +4067,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4146,7 +4129,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4195,7 +4178,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4353,13 +4336,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4393,7 +4375,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4405,7 +4387,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4421,7 +4403,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4446,7 +4428,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4502,7 +4484,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4539,7 +4521,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4682,13 +4664,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4718,7 +4699,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4730,7 +4711,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4746,7 +4727,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4771,7 +4752,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4794,7 +4775,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4827,7 +4808,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4948,13 +4929,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4988,7 +4968,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5000,7 +4980,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5016,7 +4996,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5035,7 +5015,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5064,7 +5044,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5087,7 +5067,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5165,13 +5145,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5201,7 +5180,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5213,7 +5192,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5229,7 +5208,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5248,7 +5227,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5277,7 +5256,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5300,7 +5279,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5378,13 +5357,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5414,7 +5392,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5426,7 +5404,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5442,7 +5420,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5461,7 +5439,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5495,7 +5473,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5520,7 +5498,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5601,13 +5579,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5637,7 +5614,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5649,7 +5626,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5665,7 +5642,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5684,7 +5661,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5745,7 +5722,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5784,7 +5761,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5891,13 +5868,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5927,7 +5903,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5939,7 +5915,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5955,7 +5931,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5974,7 +5950,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -6003,7 +5979,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6026,7 +6002,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6104,13 +6080,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6140,7 +6115,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6152,7 +6127,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6168,7 +6143,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6187,7 +6162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 980b7a0c1f89..19201e6173a3 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -316,13 +311,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -356,7 +350,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -368,7 +362,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -384,7 +378,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -435,7 +429,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs index 9d06e1ac4a9e..79331ea4b0ef 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -667,11 +668,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -716,7 +712,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -724,8 +720,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -758,7 +753,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -781,7 +776,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -881,13 +876,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -921,7 +915,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -933,7 +927,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -949,7 +943,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +962,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -998,7 +992,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1023,7 +1017,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1112,13 +1106,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1152,7 +1145,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1164,7 +1157,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1180,7 +1173,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1199,7 +1192,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1228,7 +1221,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1251,7 +1244,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1349,13 +1342,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1389,7 +1381,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1401,7 +1393,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1417,7 +1409,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1500,7 +1492,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1529,7 +1521,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1552,7 +1544,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1650,13 +1642,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1690,7 +1681,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1702,7 +1693,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1718,7 +1709,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1775,7 +1766,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1793,7 +1784,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1816,7 +1807,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1903,13 +1894,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1943,7 +1933,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1955,7 +1945,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1971,7 +1961,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2034,7 +2024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2063,7 +2053,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2086,7 +2076,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2180,13 +2170,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2220,7 +2209,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2232,7 +2221,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2248,7 +2237,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2279,7 +2268,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2314,7 +2303,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2341,7 +2330,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2435,13 +2424,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2475,7 +2463,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2487,7 +2475,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2503,7 +2491,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2522,7 +2510,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2557,7 +2545,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2584,7 +2572,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2695,13 +2683,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2735,7 +2722,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2747,7 +2734,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2763,7 +2750,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2814,7 +2801,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2849,7 +2836,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2876,7 +2863,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2987,13 +2974,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3027,7 +3013,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3039,7 +3025,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3055,7 +3041,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3106,7 +3092,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3136,7 +3122,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3161,7 +3147,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3266,13 +3252,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3306,7 +3291,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3318,7 +3303,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3334,7 +3319,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3385,7 +3370,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs index 08624b36f6ad..a91b3566ff25 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -293,11 +294,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -342,7 +338,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -350,8 +346,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -384,7 +379,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -407,7 +402,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -473,13 +468,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -509,7 +503,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -521,7 +515,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -537,7 +531,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -562,7 +556,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -577,7 +571,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -598,7 +592,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -670,13 +664,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -710,7 +703,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -722,7 +715,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -738,7 +731,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +782,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -807,7 +800,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -830,7 +823,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -904,13 +897,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -940,7 +932,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -952,7 +944,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +960,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1052,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1075,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1171,13 +1163,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1207,7 +1198,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1219,7 +1210,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1235,7 +1226,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1292,7 +1283,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs index c8536386fafb..278b5313c81f 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs @@ -22,6 +22,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -536,11 +537,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -590,7 +586,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -599,8 +595,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -634,7 +629,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -657,7 +652,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -735,13 +730,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -771,7 +765,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -783,7 +777,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -799,7 +793,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -818,7 +812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -847,7 +841,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -870,7 +864,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -948,13 +942,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -984,7 +977,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -996,7 +989,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1012,7 +1005,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1053,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1076,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1161,13 +1154,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1197,7 +1189,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1209,7 +1201,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1225,7 +1217,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1244,7 +1236,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1273,7 +1265,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1296,7 +1288,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1362,13 +1354,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1398,7 +1389,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1410,7 +1401,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1426,7 +1417,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1451,7 +1442,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1480,7 +1471,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1503,7 +1494,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1579,13 +1570,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1627,7 +1617,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1643,7 +1633,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1750,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1784,7 +1774,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1809,7 +1799,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1894,13 +1884,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1957,7 +1946,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1969,7 +1958,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1985,7 +1974,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2042,7 +2031,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2046,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2078,7 +2067,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2136,13 +2125,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2172,7 +2160,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2184,7 +2172,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2200,7 +2188,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2219,7 +2207,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2253,7 +2241,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2278,7 +2266,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2360,13 +2348,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2396,7 +2383,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2408,7 +2395,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2424,7 +2411,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2449,7 +2436,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net10/OneOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/OneOf/.openapi-generator/FILES index cfb76c7ed0ac..de14bc5e5e2a 100644 --- a/samples/client/petstore/csharp/generichost/net10/OneOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net10/OneOf/.openapi-generator/FILES @@ -37,6 +37,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 951a8589ef49..592c9c5898ef 100644 --- a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/Petstore/.openapi-generator/FILES index a3e02b328e0a..3a66c0df35db 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/.openapi-generator/FILES @@ -154,6 +154,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 0de8a13cdbd7..4946f189d1b9 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -305,13 +300,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -341,7 +335,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -353,7 +347,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -369,7 +363,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -420,7 +414,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index 5b43ed103210..59286835beb1 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -375,11 +376,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -424,7 +420,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -432,8 +428,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -452,7 +447,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -473,7 +468,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -540,13 +535,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -576,7 +570,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -588,7 +582,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -604,7 +598,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -655,7 +649,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -684,7 +678,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -707,7 +701,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -783,13 +777,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -819,7 +812,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -831,7 +824,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -847,7 +840,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -866,7 +859,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -881,7 +874,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -902,7 +895,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -969,13 +962,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1005,7 +997,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1017,7 +1009,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1033,7 +1025,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1084,7 +1076,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1099,7 +1091,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1120,7 +1112,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1187,13 +1179,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1223,7 +1214,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1235,7 +1226,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1251,7 +1242,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1308,7 +1299,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1323,7 +1314,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1344,7 +1335,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1411,13 +1402,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1447,7 +1437,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1459,7 +1449,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1475,7 +1465,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1526,7 +1516,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1541,7 +1531,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1562,7 +1552,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1629,13 +1619,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1665,7 +1654,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1677,7 +1666,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1693,7 +1682,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1744,7 +1733,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index 46b99593f1d7..7ba4ebd49ce9 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1225,11 +1226,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1274,7 +1270,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1282,8 +1278,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1302,7 +1297,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1323,7 +1318,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1390,13 +1385,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1426,7 +1420,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1438,7 +1432,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1454,7 +1448,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1505,7 +1499,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1523,7 +1517,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1546,7 +1540,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1634,13 +1628,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1670,7 +1663,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1682,7 +1675,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1698,7 +1691,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1749,7 +1742,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1778,7 +1771,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1801,7 +1794,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1891,13 +1884,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1927,7 +1919,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1939,7 +1931,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1955,7 +1947,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2006,7 +1998,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2024,7 +2016,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2047,7 +2039,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2135,13 +2127,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2171,7 +2162,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2183,7 +2174,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2199,7 +2190,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2250,7 +2241,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2280,7 +2271,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2305,7 +2296,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2404,13 +2395,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2440,7 +2430,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2452,7 +2442,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2468,7 +2458,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2519,7 +2509,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2534,7 +2524,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2555,7 +2545,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2622,13 +2612,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2658,7 +2647,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2670,7 +2659,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2686,7 +2675,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2737,7 +2726,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2752,7 +2741,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2773,7 +2762,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2840,13 +2829,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2876,7 +2864,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2888,7 +2876,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2904,7 +2892,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2955,7 +2943,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2970,7 +2958,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2991,7 +2979,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3058,13 +3046,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3094,7 +3081,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3106,7 +3093,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3122,7 +3109,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3173,7 +3160,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3202,7 +3189,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3225,7 +3212,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3303,13 +3290,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3339,7 +3325,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3351,7 +3337,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3367,7 +3353,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3386,7 +3372,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3415,7 +3401,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3438,7 +3424,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3516,13 +3502,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3552,7 +3537,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3564,7 +3549,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3580,7 +3565,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3599,7 +3584,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3633,7 +3618,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3658,7 +3643,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3745,13 +3730,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3781,7 +3765,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3793,7 +3777,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3809,7 +3793,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3828,7 +3812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3857,7 +3841,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3880,7 +3864,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3967,13 +3951,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4003,7 +3986,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4015,7 +3998,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4031,7 +4014,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4082,7 +4065,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4144,7 +4127,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4193,7 +4176,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4351,13 +4334,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4391,7 +4373,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4403,7 +4385,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4419,7 +4401,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4444,7 +4426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4500,7 +4482,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4537,7 +4519,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4680,13 +4662,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4716,7 +4697,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4728,7 +4709,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4744,7 +4725,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4769,7 +4750,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4792,7 +4773,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4825,7 +4806,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4946,13 +4927,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4986,7 +4966,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4998,7 +4978,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5014,7 +4994,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5033,7 +5013,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5062,7 +5042,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5085,7 +5065,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5163,13 +5143,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5199,7 +5178,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5211,7 +5190,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5227,7 +5206,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5246,7 +5225,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5275,7 +5254,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5298,7 +5277,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5376,13 +5355,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5412,7 +5390,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5424,7 +5402,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5440,7 +5418,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5459,7 +5437,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5493,7 +5471,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5518,7 +5496,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5599,13 +5577,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5635,7 +5612,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5647,7 +5624,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5663,7 +5640,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5682,7 +5659,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5743,7 +5720,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5782,7 +5759,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5889,13 +5866,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5925,7 +5901,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5937,7 +5913,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5953,7 +5929,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5972,7 +5948,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -6001,7 +5977,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6024,7 +6000,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6102,13 +6078,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6138,7 +6113,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6150,7 +6125,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6166,7 +6141,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6185,7 +6160,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 2813dbef14b7..fb834c1244ed 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -314,13 +309,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -354,7 +348,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -366,7 +360,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -382,7 +376,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -433,7 +427,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index 0843443b2ae3..75999a1c5f60 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -665,11 +666,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -714,7 +710,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -722,8 +718,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -756,7 +751,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -779,7 +774,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -879,13 +874,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -919,7 +913,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -931,7 +925,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -947,7 +941,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +960,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -996,7 +990,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1021,7 +1015,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1110,13 +1104,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1150,7 +1143,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1162,7 +1155,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1178,7 +1171,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1197,7 +1190,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1226,7 +1219,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1249,7 +1242,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1347,13 +1340,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1387,7 +1379,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1399,7 +1391,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1415,7 +1407,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1498,7 +1490,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1527,7 +1519,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1550,7 +1542,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1648,13 +1640,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1688,7 +1679,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1700,7 +1691,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1716,7 +1707,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1773,7 +1764,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1791,7 +1782,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1814,7 +1805,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1901,13 +1892,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1941,7 +1931,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1953,7 +1943,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1969,7 +1959,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2032,7 +2022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2061,7 +2051,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2084,7 +2074,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2178,13 +2168,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2218,7 +2207,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2230,7 +2219,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2246,7 +2235,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2277,7 +2266,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2312,7 +2301,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2339,7 +2328,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2433,13 +2422,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2473,7 +2461,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2485,7 +2473,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2501,7 +2489,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2520,7 +2508,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2555,7 +2543,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2582,7 +2570,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2693,13 +2681,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2733,7 +2720,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2745,7 +2732,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2761,7 +2748,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2812,7 +2799,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2847,7 +2834,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2874,7 +2861,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2985,13 +2972,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3025,7 +3011,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3037,7 +3023,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3053,7 +3039,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3104,7 +3090,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3134,7 +3120,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3159,7 +3145,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3264,13 +3250,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3304,7 +3289,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3316,7 +3301,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3332,7 +3317,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3383,7 +3368,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs index f05331998ad1..3cbfda259a8b 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -291,11 +292,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -340,7 +336,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -348,8 +344,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -382,7 +377,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -405,7 +400,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -471,13 +466,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -507,7 +501,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -519,7 +513,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -535,7 +529,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -560,7 +554,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -575,7 +569,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -596,7 +590,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -668,13 +662,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -708,7 +701,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -720,7 +713,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -736,7 +729,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -787,7 +780,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -805,7 +798,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -828,7 +821,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -902,13 +895,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -938,7 +930,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -950,7 +942,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +958,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1021,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1050,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1073,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1169,13 +1161,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1205,7 +1196,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1217,7 +1208,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1233,7 +1224,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1290,7 +1281,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index ecdf56916766..097407c2d62a 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -20,6 +20,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -534,11 +535,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -588,7 +584,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -597,8 +593,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -632,7 +627,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -655,7 +650,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -733,13 +728,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -769,7 +763,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -781,7 +775,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -797,7 +791,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -816,7 +810,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -845,7 +839,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -868,7 +862,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -946,13 +940,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -982,7 +975,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -994,7 +987,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1010,7 +1003,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1051,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1074,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1159,13 +1152,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1195,7 +1187,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1207,7 +1199,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1223,7 +1215,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1242,7 +1234,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1271,7 +1263,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1294,7 +1286,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1360,13 +1352,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1396,7 +1387,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1408,7 +1399,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1424,7 +1415,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1449,7 +1440,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1478,7 +1469,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1501,7 +1492,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1577,13 +1568,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1613,7 +1603,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1625,7 +1615,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1641,7 +1631,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1748,7 +1738,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1782,7 +1772,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1807,7 +1797,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1892,13 +1882,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1955,7 +1944,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1967,7 +1956,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1983,7 +1972,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2040,7 +2029,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2055,7 +2044,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2076,7 +2065,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2134,13 +2123,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2170,7 +2158,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2182,7 +2170,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2198,7 +2186,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2217,7 +2205,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2251,7 +2239,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2276,7 +2264,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2358,13 +2346,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2394,7 +2381,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2406,7 +2393,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2422,7 +2409,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2447,7 +2434,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/.openapi-generator/FILES index a3e02b328e0a..3a66c0df35db 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/.openapi-generator/FILES @@ -154,6 +154,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 04b8da36fe38..8c27696f8420 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -307,13 +302,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -343,7 +337,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -355,7 +349,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -371,7 +365,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -422,7 +416,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs index 23e4f720a4b2..00f9455abbba 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -377,11 +378,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -426,7 +422,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -434,8 +430,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -454,7 +449,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -475,7 +470,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -542,13 +537,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -578,7 +572,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -590,7 +584,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -606,7 +600,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -657,7 +651,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -686,7 +680,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -709,7 +703,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -785,13 +779,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -821,7 +814,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -833,7 +826,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -849,7 +842,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -868,7 +861,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -883,7 +876,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -904,7 +897,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -971,13 +964,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1007,7 +999,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1019,7 +1011,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1035,7 +1027,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1086,7 +1078,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1101,7 +1093,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1122,7 +1114,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1189,13 +1181,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1225,7 +1216,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1237,7 +1228,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1253,7 +1244,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1310,7 +1301,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1325,7 +1316,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1346,7 +1337,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1413,13 +1404,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1449,7 +1439,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1461,7 +1451,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1477,7 +1467,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1528,7 +1518,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1543,7 +1533,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1564,7 +1554,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1631,13 +1621,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1667,7 +1656,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1679,7 +1668,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1695,7 +1684,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1746,7 +1735,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs index 9242390191ce..3e7893ff2380 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1227,11 +1228,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1276,7 +1272,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1284,8 +1280,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1304,7 +1299,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1325,7 +1320,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1392,13 +1387,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1428,7 +1422,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1440,7 +1434,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1456,7 +1450,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1507,7 +1501,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1519,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1542,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1636,13 +1630,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1672,7 +1665,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1684,7 +1677,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1700,7 +1693,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1751,7 +1744,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1780,7 +1773,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1803,7 +1796,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1893,13 +1886,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1929,7 +1921,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1941,7 +1933,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1957,7 +1949,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2008,7 +2000,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2026,7 +2018,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2049,7 +2041,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2137,13 +2129,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2173,7 +2164,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2185,7 +2176,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2201,7 +2192,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2252,7 +2243,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2282,7 +2273,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2307,7 +2298,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2406,13 +2397,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2442,7 +2432,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2454,7 +2444,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2470,7 +2460,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2521,7 +2511,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2536,7 +2526,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2557,7 +2547,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2624,13 +2614,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2660,7 +2649,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2672,7 +2661,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2688,7 +2677,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2739,7 +2728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2754,7 +2743,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2775,7 +2764,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2842,13 +2831,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2878,7 +2866,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2890,7 +2878,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2906,7 +2894,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2957,7 +2945,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2972,7 +2960,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2993,7 +2981,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3060,13 +3048,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3096,7 +3083,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3108,7 +3095,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3124,7 +3111,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3175,7 +3162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3204,7 +3191,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3227,7 +3214,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3305,13 +3292,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3341,7 +3327,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3353,7 +3339,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3369,7 +3355,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3388,7 +3374,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3417,7 +3403,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3440,7 +3426,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3518,13 +3504,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3554,7 +3539,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3566,7 +3551,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3582,7 +3567,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3601,7 +3586,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3635,7 +3620,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3660,7 +3645,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3747,13 +3732,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3783,7 +3767,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3795,7 +3779,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3811,7 +3795,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3830,7 +3814,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3859,7 +3843,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3882,7 +3866,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3969,13 +3953,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4005,7 +3988,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4017,7 +4000,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4033,7 +4016,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4084,7 +4067,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4146,7 +4129,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4195,7 +4178,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4353,13 +4336,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4393,7 +4375,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4405,7 +4387,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4421,7 +4403,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4446,7 +4428,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4502,7 +4484,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4539,7 +4521,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4682,13 +4664,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4718,7 +4699,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4730,7 +4711,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4746,7 +4727,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4771,7 +4752,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4794,7 +4775,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4827,7 +4808,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4948,13 +4929,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4988,7 +4968,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5000,7 +4980,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5016,7 +4996,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5035,7 +5015,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5064,7 +5044,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5087,7 +5067,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5165,13 +5145,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5201,7 +5180,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5213,7 +5192,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5229,7 +5208,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5248,7 +5227,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5277,7 +5256,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5300,7 +5279,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5378,13 +5357,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5414,7 +5392,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5426,7 +5404,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5442,7 +5420,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5461,7 +5439,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5495,7 +5473,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5520,7 +5498,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5601,13 +5579,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5637,7 +5614,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5649,7 +5626,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5665,7 +5642,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5684,7 +5661,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5745,7 +5722,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5784,7 +5761,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5891,13 +5868,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5927,7 +5903,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5939,7 +5915,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5955,7 +5931,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5974,7 +5950,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -6003,7 +5979,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6026,7 +6002,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6104,13 +6080,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6140,7 +6115,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6152,7 +6127,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6168,7 +6143,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6187,7 +6162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 980b7a0c1f89..19201e6173a3 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -316,13 +311,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -356,7 +350,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -368,7 +362,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -384,7 +378,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -435,7 +429,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs index 9d06e1ac4a9e..79331ea4b0ef 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -667,11 +668,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -716,7 +712,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -724,8 +720,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -758,7 +753,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -781,7 +776,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -881,13 +876,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -921,7 +915,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -933,7 +927,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -949,7 +943,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +962,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -998,7 +992,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1023,7 +1017,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1112,13 +1106,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1152,7 +1145,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1164,7 +1157,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1180,7 +1173,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1199,7 +1192,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1228,7 +1221,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1251,7 +1244,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1349,13 +1342,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1389,7 +1381,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1401,7 +1393,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1417,7 +1409,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1500,7 +1492,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1529,7 +1521,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1552,7 +1544,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1650,13 +1642,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1690,7 +1681,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1702,7 +1693,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1718,7 +1709,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1775,7 +1766,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1793,7 +1784,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1816,7 +1807,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1903,13 +1894,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1943,7 +1933,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1955,7 +1945,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1971,7 +1961,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2034,7 +2024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2063,7 +2053,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2086,7 +2076,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2180,13 +2170,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2220,7 +2209,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2232,7 +2221,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2248,7 +2237,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2279,7 +2268,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2314,7 +2303,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2341,7 +2330,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2435,13 +2424,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2475,7 +2463,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2487,7 +2475,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2503,7 +2491,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2522,7 +2510,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2557,7 +2545,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2584,7 +2572,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2695,13 +2683,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2735,7 +2722,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2747,7 +2734,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2763,7 +2750,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2814,7 +2801,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2849,7 +2836,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2876,7 +2863,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2987,13 +2974,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3027,7 +3013,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3039,7 +3025,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3055,7 +3041,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3106,7 +3092,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3136,7 +3122,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3161,7 +3147,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3266,13 +3252,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3306,7 +3291,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3318,7 +3303,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3334,7 +3319,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3385,7 +3370,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs index 08624b36f6ad..a91b3566ff25 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -293,11 +294,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -342,7 +338,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -350,8 +346,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -384,7 +379,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -407,7 +402,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -473,13 +468,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -509,7 +503,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -521,7 +515,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -537,7 +531,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -562,7 +556,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -577,7 +571,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -598,7 +592,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -670,13 +664,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -710,7 +703,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -722,7 +715,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -738,7 +731,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +782,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -807,7 +800,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -830,7 +823,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -904,13 +897,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -940,7 +932,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -952,7 +944,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +960,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1052,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1075,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1171,13 +1163,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1207,7 +1198,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1219,7 +1210,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1235,7 +1226,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1292,7 +1283,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs index c8536386fafb..278b5313c81f 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs @@ -22,6 +22,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -536,11 +537,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -590,7 +586,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -599,8 +595,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -634,7 +629,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -657,7 +652,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -735,13 +730,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -771,7 +765,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -783,7 +777,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -799,7 +793,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -818,7 +812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -847,7 +841,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -870,7 +864,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -948,13 +942,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -984,7 +977,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -996,7 +989,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1012,7 +1005,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1053,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1076,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1161,13 +1154,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1197,7 +1189,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1209,7 +1201,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1225,7 +1217,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1244,7 +1236,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1273,7 +1265,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1296,7 +1288,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1362,13 +1354,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1398,7 +1389,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1410,7 +1401,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1426,7 +1417,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1451,7 +1442,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1480,7 +1471,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1503,7 +1494,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1579,13 +1570,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1627,7 +1617,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1643,7 +1633,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1750,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1784,7 +1774,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1809,7 +1799,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1894,13 +1884,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1957,7 +1946,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1969,7 +1958,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1985,7 +1974,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2042,7 +2031,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2046,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2078,7 +2067,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2136,13 +2125,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2172,7 +2160,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2184,7 +2172,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2200,7 +2188,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2219,7 +2207,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2253,7 +2241,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2278,7 +2266,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2360,13 +2348,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2396,7 +2383,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2408,7 +2395,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2424,7 +2411,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2449,7 +2436,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/.openapi-generator/FILES index e28da391730f..014d2e094f31 100644 --- a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/.openapi-generator/FILES @@ -32,6 +32,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/NowGet200Response.cs src/Org.OpenAPITools/Org.OpenAPITools.csproj src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs index 5c7e087ff74a..a38f90d14670 100644 --- a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterNowGetDefaultImplementation(INowGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterNowGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorNowGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorNowGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task NowGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); NowGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IN /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IN /// /// /// - public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public NowGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/AllOf/.openapi-generator/FILES index 1c80f1449c66..ad628c05c571 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/.openapi-generator/FILES @@ -34,6 +34,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Adult.cs src/Org.OpenAPITools/Model/Child.cs src/Org.OpenAPITools/Model/Person.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 3745f6dafbf5..ba5b50b62959 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -160,7 +155,7 @@ private void AfterListDefaultImplementation(IListApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterList(ref suppressDefaultLog, apiResponseLocalVar, personId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -183,7 +178,7 @@ private void OnErrorListDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorList(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, personId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -257,13 +252,12 @@ public async Task ListAsync(string personId, System.Threading. using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); ListApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new ListApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/person/display/{personId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new ListApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/person/display/{personId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -293,7 +287,7 @@ public partial class ListApiResponse : Org.OpenAPITools.Client.ApiResponse, ILis /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -305,7 +299,7 @@ public partial class ListApiResponse : Org.OpenAPITools.Client.ApiResponse, ILis /// /// /// - public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -321,7 +315,7 @@ public ListApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -372,7 +366,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/.openapi-generator/FILES index 5e82fcb80ae5..d3d0b9613e66 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/.openapi-generator/FILES @@ -34,6 +34,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 24454e8f663a..2431f5a7a644 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -102,11 +103,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -126,11 +122,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -144,7 +139,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -165,7 +160,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -231,13 +226,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RootGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RootGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -267,7 +261,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -279,7 +273,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -295,7 +289,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -346,7 +340,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/.openapi-generator/FILES index 5e82fcb80ae5..d3d0b9613e66 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/.openapi-generator/FILES @@ -34,6 +34,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs index 24454e8f663a..2431f5a7a644 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -102,11 +103,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -126,11 +122,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -144,7 +139,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -165,7 +160,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -231,13 +226,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RootGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RootGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -267,7 +261,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -279,7 +273,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -295,7 +289,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -346,7 +340,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES index 4d9b3d8248d3..a2b6a7db9b46 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES @@ -177,6 +177,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1540faaeb1cf..f356eb3de999 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -304,13 +299,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new Call123TestSpecialTagsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new Call123TestSpecialTagsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -340,7 +334,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -352,7 +346,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -368,7 +362,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -419,7 +413,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs index 9750887d4beb..98a75477bb80 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -375,11 +376,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -424,7 +420,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -432,8 +428,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -452,7 +447,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -473,7 +468,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -539,13 +534,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FooGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FooGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -575,7 +569,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -587,7 +581,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -603,7 +597,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -654,7 +648,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -683,7 +677,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -706,7 +700,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -782,13 +776,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetCountryApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetCountryApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -818,7 +811,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -830,7 +823,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -846,7 +839,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -865,7 +858,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -880,7 +873,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -901,7 +894,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -967,13 +960,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new HelloApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new HelloApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1003,7 +995,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1015,7 +1007,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1082,7 +1074,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1097,7 +1089,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1118,7 +1110,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1184,13 +1176,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RedirectOrDefaultApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RedirectOrDefaultApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1220,7 +1211,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1232,7 +1223,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1248,7 +1239,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1305,7 +1296,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1320,7 +1311,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1341,7 +1332,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1407,13 +1398,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RolesReportGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RolesReportGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1443,7 +1433,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1455,7 +1445,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1471,7 +1461,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1522,7 +1512,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1537,7 +1527,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1558,7 +1548,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1624,13 +1614,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1660,7 +1649,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1672,7 +1661,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1688,7 +1677,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1739,7 +1728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index e978aa8b5292..a3be1bd72629 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1225,11 +1226,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1274,7 +1270,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1282,8 +1278,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1302,7 +1297,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1323,7 +1318,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1389,13 +1384,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeHealthGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeHealthGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1425,7 +1419,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1437,7 +1431,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1453,7 +1447,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1504,7 +1498,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1522,7 +1516,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1545,7 +1539,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1632,13 +1626,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterBooleanSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterBooleanSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1668,7 +1661,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1680,7 +1673,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1696,7 +1689,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1747,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1776,7 +1769,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1799,7 +1792,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1888,13 +1881,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterCompositeSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterCompositeSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1924,7 +1916,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1936,7 +1928,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1952,7 +1944,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2003,7 +1995,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2021,7 +2013,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2044,7 +2036,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2131,13 +2123,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterNumberSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterNumberSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2167,7 +2158,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2179,7 +2170,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2195,7 +2186,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2246,7 +2237,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2276,7 +2267,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2301,7 +2292,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2399,13 +2390,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterStringSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterStringSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2435,7 +2425,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2447,7 +2437,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2463,7 +2453,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2514,7 +2504,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2529,7 +2519,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2550,7 +2540,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2616,13 +2606,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetArrayOfEnumsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetArrayOfEnumsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2652,7 +2641,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2664,7 +2653,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2680,7 +2669,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2731,7 +2720,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2746,7 +2735,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2767,7 +2756,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2833,13 +2822,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetMixedAnyOfApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetMixedAnyOfApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2869,7 +2857,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2881,7 +2869,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2897,7 +2885,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2948,7 +2936,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2963,7 +2951,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2984,7 +2972,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3050,13 +3038,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetMixedOneOfApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetMixedOneOfApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3086,7 +3073,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3098,7 +3085,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3114,7 +3101,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3165,7 +3152,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3194,7 +3181,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3217,7 +3204,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3295,13 +3282,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestAdditionalPropertiesReferenceApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestAdditionalPropertiesReferenceApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3331,7 +3317,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3343,7 +3329,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3359,7 +3345,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3378,7 +3364,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3407,7 +3393,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3430,7 +3416,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3508,13 +3494,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestBodyWithFileSchemaApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestBodyWithFileSchemaApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3544,7 +3529,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3556,7 +3541,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3572,7 +3557,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3591,7 +3576,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3625,7 +3610,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3650,7 +3635,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3737,13 +3722,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3773,7 +3757,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3785,7 +3769,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3801,7 +3785,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3820,7 +3804,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3849,7 +3833,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3872,7 +3856,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3958,13 +3942,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestClientModelApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestClientModelApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3994,7 +3977,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4006,7 +3989,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4022,7 +4005,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4073,7 +4056,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4135,7 +4118,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4184,7 +4167,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4342,13 +4325,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestEndpointParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestEndpointParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4382,7 +4364,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4394,7 +4376,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4410,7 +4392,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4435,7 +4417,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4479,7 +4461,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4516,7 +4498,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4659,13 +4641,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestEnumParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestEnumParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4695,7 +4676,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4707,7 +4688,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4723,7 +4704,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4748,7 +4729,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4771,7 +4752,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4804,7 +4785,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4924,13 +4905,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestGroupParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestGroupParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4964,7 +4944,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4976,7 +4956,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4992,7 +4972,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5011,7 +4991,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5040,7 +5020,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5063,7 +5043,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5141,13 +5121,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestInlineAdditionalPropertiesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestInlineAdditionalPropertiesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5177,7 +5156,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5189,7 +5168,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5205,7 +5184,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5224,7 +5203,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5253,7 +5232,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5276,7 +5255,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5354,13 +5333,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestInlineFreeformAdditionalPropertiesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestInlineFreeformAdditionalPropertiesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5390,7 +5368,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5402,7 +5380,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5418,7 +5396,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5437,7 +5415,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5471,7 +5449,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5496,7 +5474,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5577,13 +5555,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestJsonFormDataApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestJsonFormDataApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5613,7 +5590,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5625,7 +5602,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5641,7 +5618,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5660,7 +5637,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5721,7 +5698,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5760,7 +5737,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5866,13 +5843,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestQueryParameterCollectionFormatApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestQueryParameterCollectionFormatApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5902,7 +5878,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5914,7 +5890,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5930,7 +5906,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5949,7 +5925,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5978,7 +5954,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6001,7 +5977,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6079,13 +6055,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestStringMapReferenceApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestStringMapReferenceApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6115,7 +6090,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6127,7 +6102,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6143,7 +6118,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6162,7 +6137,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 0fe14400f4d6..f7609df8dc77 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -313,13 +308,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestClassnameApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestClassnameApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -353,7 +347,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -365,7 +359,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -381,7 +375,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -432,7 +426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs index a7310cdc0f0a..d34716747cd1 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -665,11 +666,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -714,7 +710,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -722,8 +718,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -756,7 +751,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -779,7 +774,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -879,13 +874,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new AddPetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new AddPetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -919,7 +913,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -931,7 +925,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -947,7 +941,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +960,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -996,7 +990,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1021,7 +1015,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1109,13 +1103,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeletePetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeletePetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1149,7 +1142,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1161,7 +1154,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1177,7 +1170,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1196,7 +1189,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1225,7 +1218,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1248,7 +1241,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1345,13 +1338,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FindPetsByStatusApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FindPetsByStatusApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1385,7 +1377,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1397,7 +1389,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1413,7 +1405,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1496,7 +1488,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1517,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1540,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1645,13 +1637,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FindPetsByTagsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FindPetsByTagsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1685,7 +1676,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1697,7 +1688,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1713,7 +1704,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1770,7 +1761,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1788,7 +1779,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1811,7 +1802,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1897,13 +1888,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetPetByIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetPetByIdApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1937,7 +1927,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1949,7 +1939,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1965,7 +1955,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2028,7 +2018,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2047,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2080,7 +2070,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2174,13 +2164,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdatePetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdatePetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2214,7 +2203,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2226,7 +2215,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2242,7 +2231,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2273,7 +2262,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2308,7 +2297,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2335,7 +2324,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2429,13 +2418,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdatePetWithFormApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdatePetWithFormApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2469,7 +2457,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2481,7 +2469,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2497,7 +2485,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2516,7 +2504,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2551,7 +2539,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2578,7 +2566,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2688,13 +2676,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFileApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2728,7 +2715,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2740,7 +2727,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2756,7 +2743,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2807,7 +2794,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2842,7 +2829,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2869,7 +2856,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2979,13 +2966,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3019,7 +3005,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3031,7 +3017,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3047,7 +3033,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3098,7 +3084,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3128,7 +3114,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3153,7 +3139,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3257,13 +3243,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFilesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFilesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3297,7 +3282,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3309,7 +3294,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3325,7 +3310,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3376,7 +3361,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs index 9c7430992dbb..273ea1dc482e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -291,11 +292,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -340,7 +336,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -348,8 +344,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -382,7 +377,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -405,7 +400,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -470,13 +465,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeleteOrderApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeleteOrderApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -506,7 +500,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -518,7 +512,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -534,7 +528,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -559,7 +553,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -574,7 +568,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -595,7 +589,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -666,13 +660,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetInventoryApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetInventoryApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -706,7 +699,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -718,7 +711,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -734,7 +727,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -785,7 +778,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -803,7 +796,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -826,7 +819,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -899,13 +892,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetOrderByIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetOrderByIdApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -935,7 +927,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -947,7 +939,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -963,7 +955,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1026,7 +1018,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1055,7 +1047,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1078,7 +1070,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1165,13 +1157,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new PlaceOrderApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new PlaceOrderApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1201,7 +1192,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1213,7 +1204,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1229,7 +1220,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1286,7 +1277,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs index 4c61cc91448a..cbd4ec94fa8c 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/UserApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -533,11 +534,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -582,7 +578,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -590,8 +586,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -624,7 +619,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -647,7 +642,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -725,13 +720,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -761,7 +755,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -773,7 +767,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +783,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -808,7 +802,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -837,7 +831,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -860,7 +854,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -938,13 +932,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUsersWithArrayInputApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUsersWithArrayInputApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -974,7 +967,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -986,7 +979,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1002,7 +995,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1021,7 +1014,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1050,7 +1043,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1073,7 +1066,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1151,13 +1144,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUsersWithListInputApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUsersWithListInputApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1187,7 +1179,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1199,7 +1191,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1215,7 +1207,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1234,7 +1226,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1263,7 +1255,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1286,7 +1278,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1351,13 +1343,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeleteUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeleteUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1387,7 +1378,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1399,7 +1390,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1415,7 +1406,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1440,7 +1431,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1469,7 +1460,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1492,7 +1483,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1567,13 +1558,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetUserByNameApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetUserByNameApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1603,7 +1593,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1631,7 +1621,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1738,7 +1728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1772,7 +1762,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1797,7 +1787,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1881,13 +1871,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new LoginUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new LoginUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1917,7 +1906,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1929,7 +1918,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1945,7 +1934,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2002,7 +1991,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2017,7 +2006,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2038,7 +2027,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2095,13 +2084,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new LogoutUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new LogoutUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2131,7 +2119,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2143,7 +2131,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2159,7 +2147,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2178,7 +2166,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2212,7 +2200,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2237,7 +2225,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2319,13 +2307,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdateUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2355,7 +2342,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2367,7 +2354,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2383,7 +2370,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2408,7 +2395,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/OneOf/.openapi-generator/FILES index ef946be5e2fb..fd6d7e427e19 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/.openapi-generator/FILES @@ -35,6 +35,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 24454e8f663a..2431f5a7a644 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -102,11 +103,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -126,11 +122,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -144,7 +139,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -165,7 +160,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -231,13 +226,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RootGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RootGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -267,7 +261,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -279,7 +273,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -295,7 +289,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -346,7 +340,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES index 82501a149e01..20a67a4fabae 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/.openapi-generator/FILES @@ -152,6 +152,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1540faaeb1cf..f356eb3de999 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -304,13 +299,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new Call123TestSpecialTagsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new Call123TestSpecialTagsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -340,7 +334,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -352,7 +346,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -368,7 +362,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -419,7 +413,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index 9750887d4beb..98a75477bb80 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -375,11 +376,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -424,7 +420,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -432,8 +428,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -452,7 +447,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -473,7 +468,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -539,13 +534,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FooGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FooGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -575,7 +569,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -587,7 +581,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -603,7 +597,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -654,7 +648,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -683,7 +677,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -706,7 +700,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -782,13 +776,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetCountryApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetCountryApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -818,7 +811,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -830,7 +823,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -846,7 +839,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -865,7 +858,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -880,7 +873,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -901,7 +894,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -967,13 +960,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new HelloApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new HelloApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1003,7 +995,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1015,7 +1007,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1082,7 +1074,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1097,7 +1089,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1118,7 +1110,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1184,13 +1176,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RedirectOrDefaultApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RedirectOrDefaultApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1220,7 +1211,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1232,7 +1223,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1248,7 +1239,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1305,7 +1296,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1320,7 +1311,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1341,7 +1332,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1407,13 +1398,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RolesReportGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RolesReportGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1443,7 +1433,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1455,7 +1445,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1471,7 +1461,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1522,7 +1512,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1537,7 +1527,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1558,7 +1548,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1624,13 +1614,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1660,7 +1649,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1672,7 +1661,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1688,7 +1677,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1739,7 +1728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index 8f61b4a3e376..d69c9c09e74f 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1225,11 +1226,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1274,7 +1270,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1282,8 +1278,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1302,7 +1297,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1323,7 +1318,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1389,13 +1384,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeHealthGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeHealthGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1425,7 +1419,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1437,7 +1431,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1453,7 +1447,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1504,7 +1498,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1522,7 +1516,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1545,7 +1539,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1632,13 +1626,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterBooleanSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterBooleanSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1668,7 +1661,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1680,7 +1673,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1696,7 +1689,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1747,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1776,7 +1769,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1799,7 +1792,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1888,13 +1881,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterCompositeSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterCompositeSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1924,7 +1916,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1936,7 +1928,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1952,7 +1944,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2003,7 +1995,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2021,7 +2013,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2044,7 +2036,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2131,13 +2123,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterNumberSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterNumberSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2167,7 +2158,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2179,7 +2170,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2195,7 +2186,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2246,7 +2237,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2276,7 +2267,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2301,7 +2292,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2399,13 +2390,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterStringSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterStringSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2435,7 +2425,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2447,7 +2437,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2463,7 +2453,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2514,7 +2504,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2529,7 +2519,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2550,7 +2540,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2616,13 +2606,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetArrayOfEnumsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetArrayOfEnumsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2652,7 +2641,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2664,7 +2653,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2680,7 +2669,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2731,7 +2720,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2746,7 +2735,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2767,7 +2756,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2833,13 +2822,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetMixedAnyOfApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetMixedAnyOfApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2869,7 +2857,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2881,7 +2869,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2897,7 +2885,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2948,7 +2936,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2963,7 +2951,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2984,7 +2972,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3050,13 +3038,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetMixedOneOfApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetMixedOneOfApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3086,7 +3073,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3098,7 +3085,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3114,7 +3101,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3165,7 +3152,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3194,7 +3181,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3217,7 +3204,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3295,13 +3282,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestAdditionalPropertiesReferenceApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestAdditionalPropertiesReferenceApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3331,7 +3317,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3343,7 +3329,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3359,7 +3345,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3378,7 +3364,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3407,7 +3393,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3430,7 +3416,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3508,13 +3494,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestBodyWithFileSchemaApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestBodyWithFileSchemaApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3544,7 +3529,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3556,7 +3541,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3572,7 +3557,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3591,7 +3576,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3625,7 +3610,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3650,7 +3635,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3737,13 +3722,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3773,7 +3757,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3785,7 +3769,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3801,7 +3785,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3820,7 +3804,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3849,7 +3833,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3872,7 +3856,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3958,13 +3942,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestClientModelApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestClientModelApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3994,7 +3977,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4006,7 +3989,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4022,7 +4005,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4073,7 +4056,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4135,7 +4118,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4184,7 +4167,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4342,13 +4325,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestEndpointParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestEndpointParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4382,7 +4364,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4394,7 +4376,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4410,7 +4392,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4435,7 +4417,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4491,7 +4473,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4528,7 +4510,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4671,13 +4653,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestEnumParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestEnumParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4707,7 +4688,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4719,7 +4700,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4735,7 +4716,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4760,7 +4741,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4783,7 +4764,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4816,7 +4797,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4936,13 +4917,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestGroupParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestGroupParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4976,7 +4956,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4988,7 +4968,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5004,7 +4984,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5023,7 +5003,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5052,7 +5032,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5075,7 +5055,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5153,13 +5133,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestInlineAdditionalPropertiesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestInlineAdditionalPropertiesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5189,7 +5168,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5201,7 +5180,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5217,7 +5196,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5236,7 +5215,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5265,7 +5244,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5288,7 +5267,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5366,13 +5345,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestInlineFreeformAdditionalPropertiesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestInlineFreeformAdditionalPropertiesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5402,7 +5380,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5414,7 +5392,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5430,7 +5408,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5449,7 +5427,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5483,7 +5461,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5508,7 +5486,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5589,13 +5567,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestJsonFormDataApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestJsonFormDataApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5625,7 +5602,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5637,7 +5614,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5653,7 +5630,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5672,7 +5649,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5733,7 +5710,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5772,7 +5749,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5878,13 +5855,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestQueryParameterCollectionFormatApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestQueryParameterCollectionFormatApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5914,7 +5890,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5926,7 +5902,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5942,7 +5918,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5961,7 +5937,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5990,7 +5966,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6013,7 +5989,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6091,13 +6067,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestStringMapReferenceApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestStringMapReferenceApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6127,7 +6102,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6139,7 +6114,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6155,7 +6130,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6174,7 +6149,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 0fe14400f4d6..f7609df8dc77 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -313,13 +308,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestClassnameApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestClassnameApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -353,7 +347,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -365,7 +359,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -381,7 +375,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -432,7 +426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index d955b80e8761..20f58ef2726c 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -665,11 +666,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -714,7 +710,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -722,8 +718,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -756,7 +751,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -779,7 +774,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -879,13 +874,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new AddPetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new AddPetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -919,7 +913,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -931,7 +925,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -947,7 +941,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +960,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -996,7 +990,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1021,7 +1015,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1109,13 +1103,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeletePetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeletePetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1149,7 +1142,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1161,7 +1154,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1177,7 +1170,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1196,7 +1189,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1225,7 +1218,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1248,7 +1241,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1345,13 +1338,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FindPetsByStatusApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FindPetsByStatusApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1385,7 +1377,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1397,7 +1389,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1413,7 +1405,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1496,7 +1488,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1517,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1540,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1645,13 +1637,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FindPetsByTagsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FindPetsByTagsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1685,7 +1676,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1697,7 +1688,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1713,7 +1704,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1770,7 +1761,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1788,7 +1779,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1811,7 +1802,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1897,13 +1888,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetPetByIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetPetByIdApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1937,7 +1927,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1949,7 +1939,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1965,7 +1955,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2028,7 +2018,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2047,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2080,7 +2070,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2174,13 +2164,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdatePetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdatePetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2214,7 +2203,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2226,7 +2215,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2242,7 +2231,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2273,7 +2262,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2308,7 +2297,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2335,7 +2324,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2429,13 +2418,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdatePetWithFormApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdatePetWithFormApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2469,7 +2457,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2481,7 +2469,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2497,7 +2485,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2516,7 +2504,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2551,7 +2539,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2578,7 +2566,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2688,13 +2676,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFileApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2728,7 +2715,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2740,7 +2727,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2756,7 +2743,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2807,7 +2794,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2842,7 +2829,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2869,7 +2856,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2979,13 +2966,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3019,7 +3005,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3031,7 +3017,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3047,7 +3033,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3098,7 +3084,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3128,7 +3114,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3153,7 +3139,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3257,13 +3243,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFilesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFilesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3297,7 +3282,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3309,7 +3294,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3325,7 +3310,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3376,7 +3361,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs index 9c7430992dbb..273ea1dc482e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -291,11 +292,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -340,7 +336,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -348,8 +344,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -382,7 +377,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -405,7 +400,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -470,13 +465,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeleteOrderApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeleteOrderApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -506,7 +500,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -518,7 +512,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -534,7 +528,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -559,7 +553,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -574,7 +568,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -595,7 +589,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -666,13 +660,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetInventoryApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetInventoryApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -706,7 +699,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -718,7 +711,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -734,7 +727,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -785,7 +778,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -803,7 +796,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -826,7 +819,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -899,13 +892,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetOrderByIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetOrderByIdApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -935,7 +927,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -947,7 +939,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -963,7 +955,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1026,7 +1018,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1055,7 +1047,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1078,7 +1070,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1165,13 +1157,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new PlaceOrderApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new PlaceOrderApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1201,7 +1192,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1213,7 +1204,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1229,7 +1220,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1286,7 +1277,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index 4c61cc91448a..cbd4ec94fa8c 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -533,11 +534,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -582,7 +578,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -590,8 +586,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -624,7 +619,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -647,7 +642,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -725,13 +720,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -761,7 +755,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -773,7 +767,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +783,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -808,7 +802,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -837,7 +831,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -860,7 +854,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -938,13 +932,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUsersWithArrayInputApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUsersWithArrayInputApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -974,7 +967,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -986,7 +979,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1002,7 +995,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1021,7 +1014,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1050,7 +1043,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1073,7 +1066,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1151,13 +1144,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUsersWithListInputApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUsersWithListInputApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1187,7 +1179,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1199,7 +1191,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1215,7 +1207,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1234,7 +1226,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1263,7 +1255,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1286,7 +1278,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1351,13 +1343,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeleteUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeleteUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1387,7 +1378,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1399,7 +1390,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1415,7 +1406,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1440,7 +1431,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1469,7 +1460,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1492,7 +1483,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1567,13 +1558,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetUserByNameApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetUserByNameApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1603,7 +1593,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1631,7 +1621,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1738,7 +1728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1772,7 +1762,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1797,7 +1787,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1881,13 +1871,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new LoginUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new LoginUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1917,7 +1906,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1929,7 +1918,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1945,7 +1934,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2002,7 +1991,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2017,7 +2006,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2038,7 +2027,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2095,13 +2084,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new LogoutUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new LogoutUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2131,7 +2119,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2143,7 +2131,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2159,7 +2147,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2178,7 +2166,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2212,7 +2200,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2237,7 +2225,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2319,13 +2307,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdateUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2355,7 +2342,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2367,7 +2354,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2383,7 +2370,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2408,7 +2395,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/.openapi-generator/FILES index e28da391730f..014d2e094f31 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/.openapi-generator/FILES @@ -32,6 +32,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/NowGet200Response.cs src/Org.OpenAPITools/Org.OpenAPITools.csproj src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs index c07e3e24913e..f3639d16bee4 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -102,11 +103,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -126,11 +122,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -144,7 +139,7 @@ private void AfterNowGetDefaultImplementation(INowGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterNowGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -165,7 +160,7 @@ private void OnErrorNowGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorNowGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -231,13 +226,12 @@ public async Task NowGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); NowGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new NowGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new NowGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -267,7 +261,7 @@ public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IN /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -279,7 +273,7 @@ public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IN /// /// /// - public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -295,7 +289,7 @@ public NowGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -346,7 +340,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/AllOf/.openapi-generator/FILES index 1c80f1449c66..ad628c05c571 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/.openapi-generator/FILES @@ -34,6 +34,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Adult.cs src/Org.OpenAPITools/Model/Child.cs src/Org.OpenAPITools/Model/Person.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 3745f6dafbf5..ba5b50b62959 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -160,7 +155,7 @@ private void AfterListDefaultImplementation(IListApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterList(ref suppressDefaultLog, apiResponseLocalVar, personId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -183,7 +178,7 @@ private void OnErrorListDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorList(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, personId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -257,13 +252,12 @@ public async Task ListAsync(string personId, System.Threading. using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); ListApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new ListApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/person/display/{personId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new ListApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/person/display/{personId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -293,7 +287,7 @@ public partial class ListApiResponse : Org.OpenAPITools.Client.ApiResponse, ILis /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -305,7 +299,7 @@ public partial class ListApiResponse : Org.OpenAPITools.Client.ApiResponse, ILis /// /// /// - public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -321,7 +315,7 @@ public ListApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -372,7 +366,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/.openapi-generator/FILES index 5e82fcb80ae5..d3d0b9613e66 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/.openapi-generator/FILES @@ -34,6 +34,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 24454e8f663a..2431f5a7a644 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -102,11 +103,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -126,11 +122,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -144,7 +139,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -165,7 +160,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -231,13 +226,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RootGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RootGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -267,7 +261,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -279,7 +273,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -295,7 +289,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -346,7 +340,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/.openapi-generator/FILES index 5e82fcb80ae5..d3d0b9613e66 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/.openapi-generator/FILES @@ -34,6 +34,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs index 24454e8f663a..2431f5a7a644 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -102,11 +103,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -126,11 +122,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -144,7 +139,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -165,7 +160,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -231,13 +226,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RootGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RootGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -267,7 +261,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -279,7 +273,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -295,7 +289,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -346,7 +340,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES index 4d9b3d8248d3..a2b6a7db9b46 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES @@ -177,6 +177,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1540faaeb1cf..f356eb3de999 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -304,13 +299,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new Call123TestSpecialTagsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new Call123TestSpecialTagsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -340,7 +334,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -352,7 +346,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -368,7 +362,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -419,7 +413,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs index 9750887d4beb..98a75477bb80 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -375,11 +376,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -424,7 +420,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -432,8 +428,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -452,7 +447,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -473,7 +468,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -539,13 +534,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FooGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FooGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -575,7 +569,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -587,7 +581,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -603,7 +597,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -654,7 +648,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -683,7 +677,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -706,7 +700,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -782,13 +776,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetCountryApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetCountryApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -818,7 +811,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -830,7 +823,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -846,7 +839,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -865,7 +858,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -880,7 +873,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -901,7 +894,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -967,13 +960,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new HelloApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new HelloApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1003,7 +995,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1015,7 +1007,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1082,7 +1074,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1097,7 +1089,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1118,7 +1110,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1184,13 +1176,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RedirectOrDefaultApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RedirectOrDefaultApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1220,7 +1211,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1232,7 +1223,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1248,7 +1239,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1305,7 +1296,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1320,7 +1311,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1341,7 +1332,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1407,13 +1398,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RolesReportGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RolesReportGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1443,7 +1433,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1455,7 +1445,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1471,7 +1461,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1522,7 +1512,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1537,7 +1527,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1558,7 +1548,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1624,13 +1614,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1660,7 +1649,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1672,7 +1661,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1688,7 +1677,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1739,7 +1728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index e978aa8b5292..a3be1bd72629 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1225,11 +1226,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1274,7 +1270,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1282,8 +1278,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1302,7 +1297,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1323,7 +1318,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1389,13 +1384,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeHealthGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeHealthGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1425,7 +1419,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1437,7 +1431,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1453,7 +1447,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1504,7 +1498,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1522,7 +1516,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1545,7 +1539,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1632,13 +1626,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterBooleanSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterBooleanSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1668,7 +1661,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1680,7 +1673,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1696,7 +1689,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1747,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1776,7 +1769,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1799,7 +1792,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1888,13 +1881,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterCompositeSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterCompositeSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1924,7 +1916,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1936,7 +1928,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1952,7 +1944,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2003,7 +1995,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2021,7 +2013,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2044,7 +2036,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2131,13 +2123,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterNumberSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterNumberSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2167,7 +2158,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2179,7 +2170,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2195,7 +2186,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2246,7 +2237,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2276,7 +2267,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2301,7 +2292,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2399,13 +2390,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterStringSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterStringSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2435,7 +2425,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2447,7 +2437,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2463,7 +2453,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2514,7 +2504,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2529,7 +2519,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2550,7 +2540,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2616,13 +2606,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetArrayOfEnumsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetArrayOfEnumsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2652,7 +2641,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2664,7 +2653,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2680,7 +2669,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2731,7 +2720,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2746,7 +2735,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2767,7 +2756,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2833,13 +2822,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetMixedAnyOfApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetMixedAnyOfApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2869,7 +2857,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2881,7 +2869,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2897,7 +2885,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2948,7 +2936,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2963,7 +2951,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2984,7 +2972,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3050,13 +3038,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetMixedOneOfApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetMixedOneOfApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3086,7 +3073,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3098,7 +3085,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3114,7 +3101,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3165,7 +3152,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3194,7 +3181,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3217,7 +3204,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3295,13 +3282,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestAdditionalPropertiesReferenceApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestAdditionalPropertiesReferenceApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3331,7 +3317,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3343,7 +3329,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3359,7 +3345,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3378,7 +3364,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3407,7 +3393,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3430,7 +3416,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3508,13 +3494,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestBodyWithFileSchemaApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestBodyWithFileSchemaApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3544,7 +3529,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3556,7 +3541,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3572,7 +3557,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3591,7 +3576,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3625,7 +3610,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3650,7 +3635,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3737,13 +3722,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3773,7 +3757,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3785,7 +3769,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3801,7 +3785,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3820,7 +3804,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3849,7 +3833,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3872,7 +3856,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3958,13 +3942,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestClientModelApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestClientModelApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3994,7 +3977,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4006,7 +3989,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4022,7 +4005,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4073,7 +4056,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4135,7 +4118,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4184,7 +4167,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4342,13 +4325,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestEndpointParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestEndpointParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4382,7 +4364,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4394,7 +4376,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4410,7 +4392,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4435,7 +4417,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4479,7 +4461,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4516,7 +4498,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4659,13 +4641,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestEnumParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestEnumParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4695,7 +4676,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4707,7 +4688,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4723,7 +4704,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4748,7 +4729,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4771,7 +4752,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4804,7 +4785,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4924,13 +4905,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestGroupParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestGroupParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4964,7 +4944,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4976,7 +4956,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4992,7 +4972,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5011,7 +4991,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5040,7 +5020,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5063,7 +5043,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5141,13 +5121,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestInlineAdditionalPropertiesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestInlineAdditionalPropertiesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5177,7 +5156,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5189,7 +5168,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5205,7 +5184,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5224,7 +5203,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5253,7 +5232,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5276,7 +5255,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5354,13 +5333,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestInlineFreeformAdditionalPropertiesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestInlineFreeformAdditionalPropertiesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5390,7 +5368,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5402,7 +5380,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5418,7 +5396,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5437,7 +5415,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5471,7 +5449,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5496,7 +5474,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5577,13 +5555,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestJsonFormDataApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestJsonFormDataApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5613,7 +5590,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5625,7 +5602,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5641,7 +5618,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5660,7 +5637,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5721,7 +5698,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5760,7 +5737,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5866,13 +5843,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestQueryParameterCollectionFormatApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestQueryParameterCollectionFormatApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5902,7 +5878,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5914,7 +5890,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5930,7 +5906,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5949,7 +5925,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5978,7 +5954,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6001,7 +5977,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6079,13 +6055,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestStringMapReferenceApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestStringMapReferenceApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6115,7 +6090,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6127,7 +6102,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6143,7 +6118,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6162,7 +6137,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 0fe14400f4d6..f7609df8dc77 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -313,13 +308,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestClassnameApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestClassnameApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -353,7 +347,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -365,7 +359,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -381,7 +375,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -432,7 +426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs index a7310cdc0f0a..d34716747cd1 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -665,11 +666,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -714,7 +710,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -722,8 +718,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -756,7 +751,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -779,7 +774,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -879,13 +874,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new AddPetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new AddPetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -919,7 +913,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -931,7 +925,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -947,7 +941,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +960,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -996,7 +990,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1021,7 +1015,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1109,13 +1103,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeletePetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeletePetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1149,7 +1142,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1161,7 +1154,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1177,7 +1170,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1196,7 +1189,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1225,7 +1218,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1248,7 +1241,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1345,13 +1338,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FindPetsByStatusApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FindPetsByStatusApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1385,7 +1377,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1397,7 +1389,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1413,7 +1405,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1496,7 +1488,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1517,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1540,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1645,13 +1637,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FindPetsByTagsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FindPetsByTagsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1685,7 +1676,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1697,7 +1688,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1713,7 +1704,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1770,7 +1761,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1788,7 +1779,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1811,7 +1802,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1897,13 +1888,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetPetByIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetPetByIdApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1937,7 +1927,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1949,7 +1939,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1965,7 +1955,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2028,7 +2018,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2047,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2080,7 +2070,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2174,13 +2164,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdatePetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdatePetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2214,7 +2203,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2226,7 +2215,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2242,7 +2231,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2273,7 +2262,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2308,7 +2297,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2335,7 +2324,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2429,13 +2418,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdatePetWithFormApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdatePetWithFormApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2469,7 +2457,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2481,7 +2469,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2497,7 +2485,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2516,7 +2504,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2551,7 +2539,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2578,7 +2566,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2688,13 +2676,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFileApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2728,7 +2715,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2740,7 +2727,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2756,7 +2743,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2807,7 +2794,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2842,7 +2829,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2869,7 +2856,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2979,13 +2966,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3019,7 +3005,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3031,7 +3017,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3047,7 +3033,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3098,7 +3084,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3128,7 +3114,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3153,7 +3139,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3257,13 +3243,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFilesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFilesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3297,7 +3282,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3309,7 +3294,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3325,7 +3310,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3376,7 +3361,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs index 9c7430992dbb..273ea1dc482e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -291,11 +292,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -340,7 +336,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -348,8 +344,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -382,7 +377,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -405,7 +400,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -470,13 +465,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeleteOrderApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeleteOrderApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -506,7 +500,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -518,7 +512,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -534,7 +528,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -559,7 +553,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -574,7 +568,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -595,7 +589,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -666,13 +660,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetInventoryApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetInventoryApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -706,7 +699,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -718,7 +711,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -734,7 +727,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -785,7 +778,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -803,7 +796,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -826,7 +819,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -899,13 +892,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetOrderByIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetOrderByIdApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -935,7 +927,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -947,7 +939,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -963,7 +955,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1026,7 +1018,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1055,7 +1047,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1078,7 +1070,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1165,13 +1157,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new PlaceOrderApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new PlaceOrderApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1201,7 +1192,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1213,7 +1204,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1229,7 +1220,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1286,7 +1277,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs index 4c61cc91448a..cbd4ec94fa8c 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -533,11 +534,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -582,7 +578,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -590,8 +586,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -624,7 +619,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -647,7 +642,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -725,13 +720,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -761,7 +755,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -773,7 +767,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +783,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -808,7 +802,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -837,7 +831,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -860,7 +854,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -938,13 +932,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUsersWithArrayInputApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUsersWithArrayInputApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -974,7 +967,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -986,7 +979,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1002,7 +995,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1021,7 +1014,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1050,7 +1043,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1073,7 +1066,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1151,13 +1144,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUsersWithListInputApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUsersWithListInputApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1187,7 +1179,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1199,7 +1191,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1215,7 +1207,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1234,7 +1226,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1263,7 +1255,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1286,7 +1278,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1351,13 +1343,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeleteUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeleteUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1387,7 +1378,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1399,7 +1390,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1415,7 +1406,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1440,7 +1431,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1469,7 +1460,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1492,7 +1483,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1567,13 +1558,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetUserByNameApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetUserByNameApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1603,7 +1593,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1631,7 +1621,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1738,7 +1728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1772,7 +1762,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1797,7 +1787,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1881,13 +1871,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new LoginUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new LoginUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1917,7 +1906,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1929,7 +1918,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1945,7 +1934,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2002,7 +1991,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2017,7 +2006,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2038,7 +2027,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2095,13 +2084,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new LogoutUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new LogoutUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2131,7 +2119,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2143,7 +2131,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2159,7 +2147,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2178,7 +2166,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2212,7 +2200,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2237,7 +2225,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2319,13 +2307,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdateUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2355,7 +2342,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2367,7 +2354,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2383,7 +2370,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2408,7 +2395,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/OneOf/.openapi-generator/FILES index ef946be5e2fb..fd6d7e427e19 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/.openapi-generator/FILES @@ -35,6 +35,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 24454e8f663a..2431f5a7a644 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -102,11 +103,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -126,11 +122,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -144,7 +139,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -165,7 +160,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -231,13 +226,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RootGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RootGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -267,7 +261,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -279,7 +273,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -295,7 +289,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -346,7 +340,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES index 82501a149e01..20a67a4fabae 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/.openapi-generator/FILES @@ -152,6 +152,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1540faaeb1cf..f356eb3de999 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -304,13 +299,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new Call123TestSpecialTagsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new Call123TestSpecialTagsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -340,7 +334,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -352,7 +346,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -368,7 +362,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -419,7 +413,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index 9750887d4beb..98a75477bb80 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -375,11 +376,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -424,7 +420,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -432,8 +428,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -452,7 +447,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -473,7 +468,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -539,13 +534,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FooGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FooGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -575,7 +569,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -587,7 +581,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -603,7 +597,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -654,7 +648,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -683,7 +677,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -706,7 +700,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -782,13 +776,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetCountryApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetCountryApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -818,7 +811,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -830,7 +823,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -846,7 +839,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -865,7 +858,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -880,7 +873,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -901,7 +894,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -967,13 +960,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new HelloApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new HelloApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1003,7 +995,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1015,7 +1007,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1082,7 +1074,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1097,7 +1089,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1118,7 +1110,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1184,13 +1176,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RedirectOrDefaultApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RedirectOrDefaultApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1220,7 +1211,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1232,7 +1223,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1248,7 +1239,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1305,7 +1296,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1320,7 +1311,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1341,7 +1332,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1407,13 +1398,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RolesReportGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RolesReportGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1443,7 +1433,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1455,7 +1445,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1471,7 +1461,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1522,7 +1512,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1537,7 +1527,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1558,7 +1548,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1624,13 +1614,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1660,7 +1649,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1672,7 +1661,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1688,7 +1677,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1739,7 +1728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index 8f61b4a3e376..d69c9c09e74f 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1225,11 +1226,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1274,7 +1270,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1282,8 +1278,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1302,7 +1297,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1323,7 +1318,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1389,13 +1384,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeHealthGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeHealthGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1425,7 +1419,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1437,7 +1431,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1453,7 +1447,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1504,7 +1498,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1522,7 +1516,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1545,7 +1539,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1632,13 +1626,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterBooleanSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterBooleanSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1668,7 +1661,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1680,7 +1673,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1696,7 +1689,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1747,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1776,7 +1769,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1799,7 +1792,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1888,13 +1881,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterCompositeSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterCompositeSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1924,7 +1916,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1936,7 +1928,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1952,7 +1944,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2003,7 +1995,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2021,7 +2013,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2044,7 +2036,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2131,13 +2123,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterNumberSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterNumberSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2167,7 +2158,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2179,7 +2170,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2195,7 +2186,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2246,7 +2237,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2276,7 +2267,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2301,7 +2292,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2399,13 +2390,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterStringSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterStringSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2435,7 +2425,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2447,7 +2437,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2463,7 +2453,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2514,7 +2504,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2529,7 +2519,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2550,7 +2540,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2616,13 +2606,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetArrayOfEnumsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetArrayOfEnumsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2652,7 +2641,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2664,7 +2653,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2680,7 +2669,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2731,7 +2720,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2746,7 +2735,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2767,7 +2756,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2833,13 +2822,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetMixedAnyOfApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetMixedAnyOfApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2869,7 +2857,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2881,7 +2869,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2897,7 +2885,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2948,7 +2936,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2963,7 +2951,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2984,7 +2972,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3050,13 +3038,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetMixedOneOfApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetMixedOneOfApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3086,7 +3073,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3098,7 +3085,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3114,7 +3101,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3165,7 +3152,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3194,7 +3181,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3217,7 +3204,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3295,13 +3282,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestAdditionalPropertiesReferenceApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestAdditionalPropertiesReferenceApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3331,7 +3317,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3343,7 +3329,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3359,7 +3345,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3378,7 +3364,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3407,7 +3393,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3430,7 +3416,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3508,13 +3494,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestBodyWithFileSchemaApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestBodyWithFileSchemaApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3544,7 +3529,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3556,7 +3541,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3572,7 +3557,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3591,7 +3576,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3625,7 +3610,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3650,7 +3635,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3737,13 +3722,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3773,7 +3757,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3785,7 +3769,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3801,7 +3785,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3820,7 +3804,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3849,7 +3833,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3872,7 +3856,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3958,13 +3942,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestClientModelApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestClientModelApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3994,7 +3977,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4006,7 +3989,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4022,7 +4005,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4073,7 +4056,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4135,7 +4118,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4184,7 +4167,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4342,13 +4325,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestEndpointParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestEndpointParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4382,7 +4364,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4394,7 +4376,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4410,7 +4392,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4435,7 +4417,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4491,7 +4473,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4528,7 +4510,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4671,13 +4653,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestEnumParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestEnumParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4707,7 +4688,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4719,7 +4700,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4735,7 +4716,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4760,7 +4741,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4783,7 +4764,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4816,7 +4797,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4936,13 +4917,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestGroupParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestGroupParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4976,7 +4956,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4988,7 +4968,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5004,7 +4984,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5023,7 +5003,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5052,7 +5032,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5075,7 +5055,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5153,13 +5133,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestInlineAdditionalPropertiesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestInlineAdditionalPropertiesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5189,7 +5168,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5201,7 +5180,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5217,7 +5196,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5236,7 +5215,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5265,7 +5244,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5288,7 +5267,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5366,13 +5345,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestInlineFreeformAdditionalPropertiesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestInlineFreeformAdditionalPropertiesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5402,7 +5380,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5414,7 +5392,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5430,7 +5408,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5449,7 +5427,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5483,7 +5461,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5508,7 +5486,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5589,13 +5567,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestJsonFormDataApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestJsonFormDataApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5625,7 +5602,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5637,7 +5614,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5653,7 +5630,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5672,7 +5649,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5733,7 +5710,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5772,7 +5749,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5878,13 +5855,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestQueryParameterCollectionFormatApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestQueryParameterCollectionFormatApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5914,7 +5890,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5926,7 +5902,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5942,7 +5918,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5961,7 +5937,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5990,7 +5966,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6013,7 +5989,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6091,13 +6067,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestStringMapReferenceApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestStringMapReferenceApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6127,7 +6102,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6139,7 +6114,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6155,7 +6130,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6174,7 +6149,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 0fe14400f4d6..f7609df8dc77 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -313,13 +308,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestClassnameApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestClassnameApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -353,7 +347,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -365,7 +359,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -381,7 +375,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -432,7 +426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index d955b80e8761..20f58ef2726c 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -665,11 +666,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -714,7 +710,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -722,8 +718,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -756,7 +751,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -779,7 +774,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -879,13 +874,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new AddPetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new AddPetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -919,7 +913,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -931,7 +925,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -947,7 +941,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +960,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -996,7 +990,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1021,7 +1015,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1109,13 +1103,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeletePetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeletePetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1149,7 +1142,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1161,7 +1154,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1177,7 +1170,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1196,7 +1189,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1225,7 +1218,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1248,7 +1241,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1345,13 +1338,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FindPetsByStatusApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FindPetsByStatusApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1385,7 +1377,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1397,7 +1389,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1413,7 +1405,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1496,7 +1488,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1517,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1540,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1645,13 +1637,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FindPetsByTagsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FindPetsByTagsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1685,7 +1676,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1697,7 +1688,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1713,7 +1704,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1770,7 +1761,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1788,7 +1779,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1811,7 +1802,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1897,13 +1888,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetPetByIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetPetByIdApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1937,7 +1927,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1949,7 +1939,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1965,7 +1955,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2028,7 +2018,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2047,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2080,7 +2070,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2174,13 +2164,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdatePetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdatePetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2214,7 +2203,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2226,7 +2215,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2242,7 +2231,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2273,7 +2262,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2308,7 +2297,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2335,7 +2324,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2429,13 +2418,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdatePetWithFormApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdatePetWithFormApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2469,7 +2457,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2481,7 +2469,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2497,7 +2485,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2516,7 +2504,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2551,7 +2539,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2578,7 +2566,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2688,13 +2676,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFileApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2728,7 +2715,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2740,7 +2727,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2756,7 +2743,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2807,7 +2794,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2842,7 +2829,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2869,7 +2856,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2979,13 +2966,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3019,7 +3005,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3031,7 +3017,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3047,7 +3033,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3098,7 +3084,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3128,7 +3114,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3153,7 +3139,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3257,13 +3243,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFilesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFilesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3297,7 +3282,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3309,7 +3294,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3325,7 +3310,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3376,7 +3361,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs index 9c7430992dbb..273ea1dc482e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -291,11 +292,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -340,7 +336,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -348,8 +344,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -382,7 +377,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -405,7 +400,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -470,13 +465,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeleteOrderApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeleteOrderApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -506,7 +500,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -518,7 +512,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -534,7 +528,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -559,7 +553,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -574,7 +568,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -595,7 +589,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -666,13 +660,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetInventoryApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetInventoryApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -706,7 +699,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -718,7 +711,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -734,7 +727,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -785,7 +778,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -803,7 +796,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -826,7 +819,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -899,13 +892,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetOrderByIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetOrderByIdApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -935,7 +927,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -947,7 +939,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -963,7 +955,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1026,7 +1018,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1055,7 +1047,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1078,7 +1070,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1165,13 +1157,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new PlaceOrderApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new PlaceOrderApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1201,7 +1192,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1213,7 +1204,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1229,7 +1220,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1286,7 +1277,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index 4c61cc91448a..cbd4ec94fa8c 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -533,11 +534,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -582,7 +578,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -590,8 +586,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -624,7 +619,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -647,7 +642,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -725,13 +720,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -761,7 +755,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -773,7 +767,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +783,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -808,7 +802,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -837,7 +831,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -860,7 +854,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -938,13 +932,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUsersWithArrayInputApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUsersWithArrayInputApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -974,7 +967,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -986,7 +979,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1002,7 +995,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1021,7 +1014,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1050,7 +1043,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1073,7 +1066,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1151,13 +1144,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUsersWithListInputApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUsersWithListInputApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1187,7 +1179,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1199,7 +1191,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1215,7 +1207,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1234,7 +1226,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1263,7 +1255,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1286,7 +1278,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1351,13 +1343,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeleteUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeleteUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1387,7 +1378,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1399,7 +1390,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1415,7 +1406,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1440,7 +1431,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1469,7 +1460,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1492,7 +1483,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1567,13 +1558,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetUserByNameApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetUserByNameApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1603,7 +1593,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1631,7 +1621,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1738,7 +1728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1772,7 +1762,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1797,7 +1787,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1881,13 +1871,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new LoginUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new LoginUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1917,7 +1906,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1929,7 +1918,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1945,7 +1934,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2002,7 +1991,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2017,7 +2006,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2038,7 +2027,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2095,13 +2084,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new LogoutUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new LogoutUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2131,7 +2119,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2143,7 +2131,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2159,7 +2147,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2178,7 +2166,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2212,7 +2200,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2237,7 +2225,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2319,13 +2307,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdateUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2355,7 +2342,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2367,7 +2354,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2383,7 +2370,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2408,7 +2395,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/.openapi-generator/FILES index e28da391730f..014d2e094f31 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/.openapi-generator/FILES @@ -32,6 +32,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/NowGet200Response.cs src/Org.OpenAPITools/Org.OpenAPITools.csproj src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs index c07e3e24913e..f3639d16bee4 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -102,11 +103,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -126,11 +122,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -144,7 +139,7 @@ private void AfterNowGetDefaultImplementation(INowGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterNowGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -165,7 +160,7 @@ private void OnErrorNowGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorNowGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -231,13 +226,12 @@ public async Task NowGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); NowGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new NowGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new NowGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -267,7 +261,7 @@ public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IN /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -279,7 +273,7 @@ public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IN /// /// /// - public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -295,7 +289,7 @@ public NowGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -346,7 +340,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/AllOf/.openapi-generator/FILES index 46a8286dea29..e32fc0acf018 100644 --- a/samples/client/petstore/csharp/generichost/net8/AllOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/AllOf/.openapi-generator/FILES @@ -36,6 +36,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Adult.cs src/Org.OpenAPITools/Model/Child.cs src/Org.OpenAPITools/Model/Person.cs diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 6e510044ff6f..9df512f32a87 100644 --- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -130,11 +126,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -162,7 +157,7 @@ private void AfterListDefaultImplementation(IListApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterList(ref suppressDefaultLog, apiResponseLocalVar, personId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -185,7 +180,7 @@ private void OnErrorListDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorList(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, personId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -260,13 +255,12 @@ public async Task ListAsync(string personId, System.Threading. using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); ListApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/person/display/{personId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/person/display/{personId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -296,7 +290,7 @@ public partial class ListApiResponse : Org.OpenAPITools.Client.ApiResponse, ILis /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -308,7 +302,7 @@ public partial class ListApiResponse : Org.OpenAPITools.Client.ApiResponse, ILis /// /// /// - public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -324,7 +318,7 @@ public ListApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -375,7 +369,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/AnyOf/.openapi-generator/FILES index 072cc8408121..470d4870ee92 100644 --- a/samples/client/petstore/csharp/generichost/net8/AnyOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/AnyOf/.openapi-generator/FILES @@ -36,6 +36,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 951a8589ef49..592c9c5898ef 100644 --- a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/.openapi-generator/FILES index 072cc8408121..470d4870ee92 100644 --- a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/.openapi-generator/FILES @@ -36,6 +36,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs index 951a8589ef49..592c9c5898ef 100644 --- a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES index 737d53400248..fd2691eb4794 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES @@ -179,6 +179,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 0de8a13cdbd7..4946f189d1b9 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -305,13 +300,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -341,7 +335,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -353,7 +347,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -369,7 +363,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -420,7 +414,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs index 5b43ed103210..59286835beb1 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -375,11 +376,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -424,7 +420,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -432,8 +428,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -452,7 +447,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -473,7 +468,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -540,13 +535,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -576,7 +570,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -588,7 +582,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -604,7 +598,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -655,7 +649,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -684,7 +678,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -707,7 +701,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -783,13 +777,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -819,7 +812,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -831,7 +824,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -847,7 +840,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -866,7 +859,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -881,7 +874,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -902,7 +895,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -969,13 +962,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1005,7 +997,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1017,7 +1009,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1033,7 +1025,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1084,7 +1076,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1099,7 +1091,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1120,7 +1112,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1187,13 +1179,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1223,7 +1214,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1235,7 +1226,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1251,7 +1242,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1308,7 +1299,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1323,7 +1314,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1344,7 +1335,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1411,13 +1402,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1447,7 +1437,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1459,7 +1449,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1475,7 +1465,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1526,7 +1516,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1541,7 +1531,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1562,7 +1552,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1629,13 +1619,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1665,7 +1654,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1677,7 +1666,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1693,7 +1682,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1744,7 +1733,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 6638ec4068d1..b74e8b5e7327 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1225,11 +1226,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1274,7 +1270,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1282,8 +1278,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1302,7 +1297,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1323,7 +1318,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1390,13 +1385,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1426,7 +1420,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1438,7 +1432,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1454,7 +1448,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1505,7 +1499,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1523,7 +1517,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1546,7 +1540,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1634,13 +1628,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1670,7 +1663,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1682,7 +1675,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1698,7 +1691,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1749,7 +1742,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1778,7 +1771,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1801,7 +1794,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1891,13 +1884,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1927,7 +1919,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1939,7 +1931,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1955,7 +1947,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2006,7 +1998,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2024,7 +2016,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2047,7 +2039,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2135,13 +2127,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2171,7 +2162,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2183,7 +2174,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2199,7 +2190,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2250,7 +2241,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2280,7 +2271,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2305,7 +2296,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2404,13 +2395,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2440,7 +2430,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2452,7 +2442,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2468,7 +2458,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2519,7 +2509,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2534,7 +2524,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2555,7 +2545,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2622,13 +2612,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2658,7 +2647,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2670,7 +2659,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2686,7 +2675,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2737,7 +2726,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2752,7 +2741,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2773,7 +2762,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2840,13 +2829,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2876,7 +2864,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2888,7 +2876,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2904,7 +2892,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2955,7 +2943,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2970,7 +2958,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2991,7 +2979,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3058,13 +3046,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3094,7 +3081,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3106,7 +3093,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3122,7 +3109,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3173,7 +3160,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3202,7 +3189,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3225,7 +3212,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3303,13 +3290,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3339,7 +3325,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3351,7 +3337,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3367,7 +3353,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3386,7 +3372,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3415,7 +3401,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3438,7 +3424,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3516,13 +3502,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3552,7 +3537,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3564,7 +3549,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3580,7 +3565,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3599,7 +3584,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3633,7 +3618,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3658,7 +3643,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3745,13 +3730,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3781,7 +3765,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3793,7 +3777,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3809,7 +3793,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3828,7 +3812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3857,7 +3841,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3880,7 +3864,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3967,13 +3951,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4003,7 +3986,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4015,7 +3998,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4031,7 +4014,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4082,7 +4065,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4144,7 +4127,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4193,7 +4176,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4351,13 +4334,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4391,7 +4373,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4403,7 +4385,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4419,7 +4401,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4444,7 +4426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4488,7 +4470,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4525,7 +4507,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4668,13 +4650,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4704,7 +4685,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4716,7 +4697,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4732,7 +4713,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4757,7 +4738,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4780,7 +4761,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4813,7 +4794,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4934,13 +4915,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4974,7 +4954,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4986,7 +4966,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5002,7 +4982,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5021,7 +5001,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5050,7 +5030,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5073,7 +5053,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5151,13 +5131,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5187,7 +5166,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5199,7 +5178,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5215,7 +5194,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5234,7 +5213,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5263,7 +5242,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5286,7 +5265,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5364,13 +5343,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5400,7 +5378,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5412,7 +5390,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5428,7 +5406,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5447,7 +5425,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5481,7 +5459,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5506,7 +5484,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5587,13 +5565,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5623,7 +5600,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5635,7 +5612,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5651,7 +5628,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5670,7 +5647,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5731,7 +5708,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5770,7 +5747,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5877,13 +5854,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5913,7 +5889,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5925,7 +5901,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5941,7 +5917,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5960,7 +5936,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5989,7 +5965,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6012,7 +5988,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6090,13 +6066,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6126,7 +6101,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6138,7 +6113,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6154,7 +6129,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6173,7 +6148,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 2813dbef14b7..fb834c1244ed 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -314,13 +309,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -354,7 +348,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -366,7 +360,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -382,7 +376,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -433,7 +427,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs index 7a052a90d955..c636f7e6a084 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -665,11 +666,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -714,7 +710,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -722,8 +718,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -756,7 +751,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -779,7 +774,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -879,13 +874,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -919,7 +913,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -931,7 +925,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -947,7 +941,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +960,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -996,7 +990,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1021,7 +1015,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1110,13 +1104,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1150,7 +1143,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1162,7 +1155,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1178,7 +1171,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1197,7 +1190,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1226,7 +1219,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1249,7 +1242,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1347,13 +1340,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1387,7 +1379,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1399,7 +1391,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1415,7 +1407,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1498,7 +1490,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1527,7 +1519,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1550,7 +1542,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1648,13 +1640,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1688,7 +1679,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1700,7 +1691,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1716,7 +1707,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1773,7 +1764,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1791,7 +1782,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1814,7 +1805,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1901,13 +1892,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1941,7 +1931,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1953,7 +1943,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1969,7 +1959,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2032,7 +2022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2061,7 +2051,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2084,7 +2074,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2178,13 +2168,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2218,7 +2207,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2230,7 +2219,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2246,7 +2235,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2277,7 +2266,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2312,7 +2301,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2339,7 +2328,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2433,13 +2422,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2473,7 +2461,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2485,7 +2473,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2501,7 +2489,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2520,7 +2508,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2555,7 +2543,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2582,7 +2570,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2693,13 +2681,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2733,7 +2720,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2745,7 +2732,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2761,7 +2748,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2812,7 +2799,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2847,7 +2834,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2874,7 +2861,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2985,13 +2972,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3025,7 +3011,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3037,7 +3023,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3053,7 +3039,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3104,7 +3090,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3134,7 +3120,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3159,7 +3145,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3264,13 +3250,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3304,7 +3289,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3316,7 +3301,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3332,7 +3317,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3383,7 +3368,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs index f05331998ad1..3cbfda259a8b 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -291,11 +292,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -340,7 +336,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -348,8 +344,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -382,7 +377,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -405,7 +400,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -471,13 +466,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -507,7 +501,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -519,7 +513,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -535,7 +529,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -560,7 +554,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -575,7 +569,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -596,7 +590,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -668,13 +662,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -708,7 +701,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -720,7 +713,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -736,7 +729,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -787,7 +780,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -805,7 +798,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -828,7 +821,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -902,13 +895,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -938,7 +930,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -950,7 +942,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +958,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1021,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1050,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1073,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1169,13 +1161,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1205,7 +1196,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1217,7 +1208,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1233,7 +1224,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1290,7 +1281,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs index ecdf56916766..097407c2d62a 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/UserApi.cs @@ -20,6 +20,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -534,11 +535,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -588,7 +584,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -597,8 +593,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -632,7 +627,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -655,7 +650,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -733,13 +728,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -769,7 +763,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -781,7 +775,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -797,7 +791,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -816,7 +810,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -845,7 +839,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -868,7 +862,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -946,13 +940,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -982,7 +975,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -994,7 +987,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1010,7 +1003,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1051,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1074,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1159,13 +1152,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1195,7 +1187,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1207,7 +1199,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1223,7 +1215,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1242,7 +1234,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1271,7 +1263,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1294,7 +1286,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1360,13 +1352,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1396,7 +1387,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1408,7 +1399,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1424,7 +1415,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1449,7 +1440,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1478,7 +1469,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1501,7 +1492,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1577,13 +1568,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1613,7 +1603,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1625,7 +1615,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1641,7 +1631,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1748,7 +1738,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1782,7 +1772,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1807,7 +1797,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1892,13 +1882,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1955,7 +1944,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1967,7 +1956,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1983,7 +1972,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2040,7 +2029,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2055,7 +2044,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2076,7 +2065,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2134,13 +2123,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2170,7 +2158,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2182,7 +2170,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2198,7 +2186,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2217,7 +2205,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2251,7 +2239,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2276,7 +2264,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2358,13 +2346,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2394,7 +2381,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2406,7 +2393,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2422,7 +2409,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2447,7 +2434,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES index a3e02b328e0a..3a66c0df35db 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/.openapi-generator/FILES @@ -154,6 +154,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 04b8da36fe38..8c27696f8420 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -307,13 +302,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -343,7 +337,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -355,7 +349,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -371,7 +365,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -422,7 +416,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs index 23e4f720a4b2..00f9455abbba 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -377,11 +378,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -426,7 +422,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -434,8 +430,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -454,7 +449,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -475,7 +470,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -542,13 +537,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -578,7 +572,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -590,7 +584,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -606,7 +600,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -657,7 +651,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -686,7 +680,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -709,7 +703,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -785,13 +779,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -821,7 +814,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -833,7 +826,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -849,7 +842,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -868,7 +861,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -883,7 +876,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -904,7 +897,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -971,13 +964,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1007,7 +999,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1019,7 +1011,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1035,7 +1027,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1086,7 +1078,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1101,7 +1093,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1122,7 +1114,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1189,13 +1181,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1225,7 +1216,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1237,7 +1228,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1253,7 +1244,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1310,7 +1301,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1325,7 +1316,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1346,7 +1337,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1413,13 +1404,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1449,7 +1439,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1461,7 +1451,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1477,7 +1467,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1528,7 +1518,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1543,7 +1533,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1564,7 +1554,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1631,13 +1621,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1667,7 +1656,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1679,7 +1668,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1695,7 +1684,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1746,7 +1735,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs index 9242390191ce..3e7893ff2380 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1227,11 +1228,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1276,7 +1272,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1284,8 +1280,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1304,7 +1299,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1325,7 +1320,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1392,13 +1387,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1428,7 +1422,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1440,7 +1434,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1456,7 +1450,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1507,7 +1501,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1519,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1542,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1636,13 +1630,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1672,7 +1665,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1684,7 +1677,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1700,7 +1693,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1751,7 +1744,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1780,7 +1773,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1803,7 +1796,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1893,13 +1886,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1929,7 +1921,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1941,7 +1933,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1957,7 +1949,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2008,7 +2000,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2026,7 +2018,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2049,7 +2041,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2137,13 +2129,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2173,7 +2164,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2185,7 +2176,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2201,7 +2192,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2252,7 +2243,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2282,7 +2273,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2307,7 +2298,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2406,13 +2397,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2442,7 +2432,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2454,7 +2444,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2470,7 +2460,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2521,7 +2511,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2536,7 +2526,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2557,7 +2547,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2624,13 +2614,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2660,7 +2649,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2672,7 +2661,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2688,7 +2677,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2739,7 +2728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2754,7 +2743,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2775,7 +2764,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2842,13 +2831,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2878,7 +2866,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2890,7 +2878,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2906,7 +2894,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2957,7 +2945,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2972,7 +2960,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2993,7 +2981,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3060,13 +3048,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3096,7 +3083,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3108,7 +3095,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3124,7 +3111,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3175,7 +3162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3204,7 +3191,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3227,7 +3214,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3305,13 +3292,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3341,7 +3327,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3353,7 +3339,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3369,7 +3355,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3388,7 +3374,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3417,7 +3403,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3440,7 +3426,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3518,13 +3504,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3554,7 +3539,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3566,7 +3551,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3582,7 +3567,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3601,7 +3586,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3635,7 +3620,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3660,7 +3645,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3747,13 +3732,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3783,7 +3767,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3795,7 +3779,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3811,7 +3795,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3830,7 +3814,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3859,7 +3843,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3882,7 +3866,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3969,13 +3953,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4005,7 +3988,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4017,7 +4000,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4033,7 +4016,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4084,7 +4067,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4146,7 +4129,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4195,7 +4178,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4353,13 +4336,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4393,7 +4375,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4405,7 +4387,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4421,7 +4403,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4446,7 +4428,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4502,7 +4484,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4539,7 +4521,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4682,13 +4664,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4718,7 +4699,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4730,7 +4711,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4746,7 +4727,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4771,7 +4752,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4794,7 +4775,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4827,7 +4808,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4948,13 +4929,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4988,7 +4968,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5000,7 +4980,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5016,7 +4996,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5035,7 +5015,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5064,7 +5044,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5087,7 +5067,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5165,13 +5145,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5201,7 +5180,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5213,7 +5192,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5229,7 +5208,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5248,7 +5227,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5277,7 +5256,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5300,7 +5279,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5378,13 +5357,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5414,7 +5392,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5426,7 +5404,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5442,7 +5420,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5461,7 +5439,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5495,7 +5473,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5520,7 +5498,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5601,13 +5579,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5637,7 +5614,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5649,7 +5626,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5665,7 +5642,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5684,7 +5661,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5745,7 +5722,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5784,7 +5761,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5891,13 +5868,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5927,7 +5903,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5939,7 +5915,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5955,7 +5931,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5974,7 +5950,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -6003,7 +5979,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6026,7 +6002,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6104,13 +6080,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6140,7 +6115,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6152,7 +6127,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6168,7 +6143,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6187,7 +6162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 980b7a0c1f89..19201e6173a3 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -316,13 +311,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -356,7 +350,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -368,7 +362,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -384,7 +378,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -435,7 +429,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs index 9d06e1ac4a9e..79331ea4b0ef 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -667,11 +668,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -716,7 +712,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -724,8 +720,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -758,7 +753,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -781,7 +776,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -881,13 +876,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -921,7 +915,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -933,7 +927,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -949,7 +943,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +962,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -998,7 +992,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1023,7 +1017,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1112,13 +1106,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1152,7 +1145,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1164,7 +1157,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1180,7 +1173,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1199,7 +1192,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1228,7 +1221,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1251,7 +1244,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1349,13 +1342,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1389,7 +1381,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1401,7 +1393,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1417,7 +1409,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1500,7 +1492,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1529,7 +1521,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1552,7 +1544,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1650,13 +1642,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1690,7 +1681,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1702,7 +1693,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1718,7 +1709,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1775,7 +1766,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1793,7 +1784,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1816,7 +1807,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1903,13 +1894,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1943,7 +1933,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1955,7 +1945,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1971,7 +1961,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2034,7 +2024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2063,7 +2053,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2086,7 +2076,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2180,13 +2170,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2220,7 +2209,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2232,7 +2221,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2248,7 +2237,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2279,7 +2268,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2314,7 +2303,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2341,7 +2330,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2435,13 +2424,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2475,7 +2463,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2487,7 +2475,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2503,7 +2491,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2522,7 +2510,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2557,7 +2545,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2584,7 +2572,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2695,13 +2683,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2735,7 +2722,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2747,7 +2734,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2763,7 +2750,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2814,7 +2801,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2849,7 +2836,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2876,7 +2863,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2987,13 +2974,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3027,7 +3013,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3039,7 +3025,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3055,7 +3041,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3106,7 +3092,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3136,7 +3122,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3161,7 +3147,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3266,13 +3252,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3306,7 +3291,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3318,7 +3303,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3334,7 +3319,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3385,7 +3370,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs index 08624b36f6ad..a91b3566ff25 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -293,11 +294,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -342,7 +338,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -350,8 +346,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -384,7 +379,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -407,7 +402,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -473,13 +468,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -509,7 +503,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -521,7 +515,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -537,7 +531,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -562,7 +556,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -577,7 +571,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -598,7 +592,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -670,13 +664,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -710,7 +703,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -722,7 +715,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -738,7 +731,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +782,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -807,7 +800,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -830,7 +823,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -904,13 +897,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -940,7 +932,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -952,7 +944,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +960,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1052,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1075,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1171,13 +1163,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1207,7 +1198,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1219,7 +1210,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1235,7 +1226,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1292,7 +1283,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs index c8536386fafb..278b5313c81f 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs @@ -22,6 +22,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -536,11 +537,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -590,7 +586,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -599,8 +595,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -634,7 +629,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -657,7 +652,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -735,13 +730,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -771,7 +765,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -783,7 +777,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -799,7 +793,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -818,7 +812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -847,7 +841,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -870,7 +864,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -948,13 +942,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -984,7 +977,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -996,7 +989,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1012,7 +1005,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1053,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1076,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1161,13 +1154,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1197,7 +1189,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1209,7 +1201,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1225,7 +1217,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1244,7 +1236,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1273,7 +1265,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1296,7 +1288,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1362,13 +1354,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1398,7 +1389,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1410,7 +1401,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1426,7 +1417,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1451,7 +1442,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1480,7 +1471,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1503,7 +1494,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1579,13 +1570,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1627,7 +1617,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1643,7 +1633,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1750,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1784,7 +1774,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1809,7 +1799,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1894,13 +1884,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1957,7 +1946,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1969,7 +1958,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1985,7 +1974,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2042,7 +2031,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2046,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2078,7 +2067,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2136,13 +2125,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2172,7 +2160,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2184,7 +2172,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2200,7 +2188,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2219,7 +2207,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2253,7 +2241,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2278,7 +2266,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2360,13 +2348,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2396,7 +2383,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2408,7 +2395,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2424,7 +2411,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2449,7 +2436,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/OneOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/OneOf/.openapi-generator/FILES index cfb76c7ed0ac..de14bc5e5e2a 100644 --- a/samples/client/petstore/csharp/generichost/net8/OneOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/OneOf/.openapi-generator/FILES @@ -37,6 +37,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 951a8589ef49..592c9c5898ef 100644 --- a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES index a3e02b328e0a..3a66c0df35db 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/.openapi-generator/FILES @@ -154,6 +154,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 0de8a13cdbd7..4946f189d1b9 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -305,13 +300,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -341,7 +335,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -353,7 +347,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -369,7 +363,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -420,7 +414,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index 5b43ed103210..59286835beb1 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -375,11 +376,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -424,7 +420,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -432,8 +428,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -452,7 +447,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -473,7 +468,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -540,13 +535,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -576,7 +570,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -588,7 +582,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -604,7 +598,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -655,7 +649,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -684,7 +678,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -707,7 +701,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -783,13 +777,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -819,7 +812,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -831,7 +824,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -847,7 +840,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -866,7 +859,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -881,7 +874,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -902,7 +895,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -969,13 +962,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1005,7 +997,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1017,7 +1009,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1033,7 +1025,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1084,7 +1076,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1099,7 +1091,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1120,7 +1112,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1187,13 +1179,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1223,7 +1214,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1235,7 +1226,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1251,7 +1242,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1308,7 +1299,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1323,7 +1314,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1344,7 +1335,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1411,13 +1402,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1447,7 +1437,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1459,7 +1449,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1475,7 +1465,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1526,7 +1516,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1541,7 +1531,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1562,7 +1552,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1629,13 +1619,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1665,7 +1654,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1677,7 +1666,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1693,7 +1682,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1744,7 +1733,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index 46b99593f1d7..7ba4ebd49ce9 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1225,11 +1226,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1274,7 +1270,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1282,8 +1278,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1302,7 +1297,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1323,7 +1318,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1390,13 +1385,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1426,7 +1420,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1438,7 +1432,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1454,7 +1448,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1505,7 +1499,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1523,7 +1517,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1546,7 +1540,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1634,13 +1628,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1670,7 +1663,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1682,7 +1675,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1698,7 +1691,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1749,7 +1742,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1778,7 +1771,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1801,7 +1794,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1891,13 +1884,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1927,7 +1919,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1939,7 +1931,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1955,7 +1947,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2006,7 +1998,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2024,7 +2016,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2047,7 +2039,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2135,13 +2127,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2171,7 +2162,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2183,7 +2174,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2199,7 +2190,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2250,7 +2241,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2280,7 +2271,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2305,7 +2296,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2404,13 +2395,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2440,7 +2430,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2452,7 +2442,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2468,7 +2458,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2519,7 +2509,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2534,7 +2524,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2555,7 +2545,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2622,13 +2612,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2658,7 +2647,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2670,7 +2659,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2686,7 +2675,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2737,7 +2726,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2752,7 +2741,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2773,7 +2762,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2840,13 +2829,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2876,7 +2864,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2888,7 +2876,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2904,7 +2892,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2955,7 +2943,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2970,7 +2958,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2991,7 +2979,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3058,13 +3046,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3094,7 +3081,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3106,7 +3093,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3122,7 +3109,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3173,7 +3160,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3202,7 +3189,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3225,7 +3212,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3303,13 +3290,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3339,7 +3325,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3351,7 +3337,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3367,7 +3353,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3386,7 +3372,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3415,7 +3401,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3438,7 +3424,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3516,13 +3502,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3552,7 +3537,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3564,7 +3549,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3580,7 +3565,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3599,7 +3584,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3633,7 +3618,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3658,7 +3643,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3745,13 +3730,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3781,7 +3765,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3793,7 +3777,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3809,7 +3793,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3828,7 +3812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3857,7 +3841,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3880,7 +3864,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3967,13 +3951,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4003,7 +3986,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4015,7 +3998,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4031,7 +4014,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4082,7 +4065,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4144,7 +4127,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4193,7 +4176,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4351,13 +4334,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4391,7 +4373,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4403,7 +4385,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4419,7 +4401,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4444,7 +4426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4500,7 +4482,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4537,7 +4519,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4680,13 +4662,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4716,7 +4697,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4728,7 +4709,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4744,7 +4725,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4769,7 +4750,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4792,7 +4773,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4825,7 +4806,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4946,13 +4927,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4986,7 +4966,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4998,7 +4978,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5014,7 +4994,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5033,7 +5013,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5062,7 +5042,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5085,7 +5065,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5163,13 +5143,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5199,7 +5178,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5211,7 +5190,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5227,7 +5206,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5246,7 +5225,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5275,7 +5254,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5298,7 +5277,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5376,13 +5355,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5412,7 +5390,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5424,7 +5402,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5440,7 +5418,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5459,7 +5437,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5493,7 +5471,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5518,7 +5496,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5599,13 +5577,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5635,7 +5612,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5647,7 +5624,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5663,7 +5640,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5682,7 +5659,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5743,7 +5720,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5782,7 +5759,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5889,13 +5866,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5925,7 +5901,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5937,7 +5913,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5953,7 +5929,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5972,7 +5948,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -6001,7 +5977,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6024,7 +6000,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6102,13 +6078,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6138,7 +6113,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6150,7 +6125,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6166,7 +6141,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6185,7 +6160,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 2813dbef14b7..fb834c1244ed 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -314,13 +309,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -354,7 +348,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -366,7 +360,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -382,7 +376,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -433,7 +427,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index 0843443b2ae3..75999a1c5f60 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -665,11 +666,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -714,7 +710,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -722,8 +718,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -756,7 +751,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -779,7 +774,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -879,13 +874,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -919,7 +913,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -931,7 +925,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -947,7 +941,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +960,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -996,7 +990,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1021,7 +1015,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1110,13 +1104,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1150,7 +1143,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1162,7 +1155,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1178,7 +1171,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1197,7 +1190,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1226,7 +1219,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1249,7 +1242,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1347,13 +1340,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1387,7 +1379,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1399,7 +1391,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1415,7 +1407,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1498,7 +1490,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1527,7 +1519,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1550,7 +1542,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1648,13 +1640,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1688,7 +1679,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1700,7 +1691,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1716,7 +1707,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1773,7 +1764,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1791,7 +1782,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1814,7 +1805,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1901,13 +1892,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1941,7 +1931,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1953,7 +1943,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1969,7 +1959,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2032,7 +2022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2061,7 +2051,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2084,7 +2074,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2178,13 +2168,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2218,7 +2207,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2230,7 +2219,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2246,7 +2235,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2277,7 +2266,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2312,7 +2301,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2339,7 +2328,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2433,13 +2422,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2473,7 +2461,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2485,7 +2473,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2501,7 +2489,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2520,7 +2508,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2555,7 +2543,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2582,7 +2570,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2693,13 +2681,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2733,7 +2720,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2745,7 +2732,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2761,7 +2748,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2812,7 +2799,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2847,7 +2834,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2874,7 +2861,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2985,13 +2972,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3025,7 +3011,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3037,7 +3023,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3053,7 +3039,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3104,7 +3090,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3134,7 +3120,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3159,7 +3145,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3264,13 +3250,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3304,7 +3289,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3316,7 +3301,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3332,7 +3317,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3383,7 +3368,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs index f05331998ad1..3cbfda259a8b 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -291,11 +292,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -340,7 +336,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -348,8 +344,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -382,7 +377,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -405,7 +400,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -471,13 +466,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -507,7 +501,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -519,7 +513,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -535,7 +529,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -560,7 +554,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -575,7 +569,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -596,7 +590,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -668,13 +662,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -708,7 +701,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -720,7 +713,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -736,7 +729,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -787,7 +780,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -805,7 +798,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -828,7 +821,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -902,13 +895,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -938,7 +930,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -950,7 +942,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +958,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1021,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1050,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1073,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1169,13 +1161,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1205,7 +1196,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1217,7 +1208,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1233,7 +1224,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1290,7 +1281,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index ecdf56916766..097407c2d62a 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -20,6 +20,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -534,11 +535,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -588,7 +584,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -597,8 +593,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -632,7 +627,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -655,7 +650,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -733,13 +728,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -769,7 +763,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -781,7 +775,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -797,7 +791,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -816,7 +810,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -845,7 +839,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -868,7 +862,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -946,13 +940,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -982,7 +975,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -994,7 +987,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1010,7 +1003,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1051,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1074,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1159,13 +1152,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1195,7 +1187,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1207,7 +1199,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1223,7 +1215,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1242,7 +1234,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1271,7 +1263,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1294,7 +1286,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1360,13 +1352,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1396,7 +1387,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1408,7 +1399,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1424,7 +1415,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1449,7 +1440,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1478,7 +1469,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1501,7 +1492,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1577,13 +1568,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1613,7 +1603,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1625,7 +1615,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1641,7 +1631,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1748,7 +1738,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1782,7 +1772,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1807,7 +1797,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1892,13 +1882,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1955,7 +1944,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1967,7 +1956,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1983,7 +1972,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2040,7 +2029,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2055,7 +2044,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2076,7 +2065,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2134,13 +2123,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2170,7 +2158,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2182,7 +2170,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2198,7 +2186,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2217,7 +2205,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2251,7 +2239,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2276,7 +2264,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2358,13 +2346,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2394,7 +2381,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2406,7 +2393,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2422,7 +2409,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2447,7 +2434,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES index a3e02b328e0a..3a66c0df35db 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/.openapi-generator/FILES @@ -154,6 +154,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 04b8da36fe38..8c27696f8420 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -307,13 +302,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -343,7 +337,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -355,7 +349,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -371,7 +365,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -422,7 +416,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs index 23e4f720a4b2..00f9455abbba 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -377,11 +378,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -426,7 +422,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -434,8 +430,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -454,7 +449,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -475,7 +470,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -542,13 +537,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -578,7 +572,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -590,7 +584,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -606,7 +600,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -657,7 +651,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -686,7 +680,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -709,7 +703,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -785,13 +779,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -821,7 +814,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -833,7 +826,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -849,7 +842,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -868,7 +861,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -883,7 +876,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -904,7 +897,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -971,13 +964,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1007,7 +999,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1019,7 +1011,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1035,7 +1027,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1086,7 +1078,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1101,7 +1093,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1122,7 +1114,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1189,13 +1181,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1225,7 +1216,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1237,7 +1228,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1253,7 +1244,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1310,7 +1301,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1325,7 +1316,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1346,7 +1337,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1413,13 +1404,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1449,7 +1439,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1461,7 +1451,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1477,7 +1467,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1528,7 +1518,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1543,7 +1533,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1564,7 +1554,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1631,13 +1621,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1667,7 +1656,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1679,7 +1668,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1695,7 +1684,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1746,7 +1735,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs index 9242390191ce..3e7893ff2380 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1227,11 +1228,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1276,7 +1272,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1284,8 +1280,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1304,7 +1299,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1325,7 +1320,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1392,13 +1387,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1428,7 +1422,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1440,7 +1434,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1456,7 +1450,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1507,7 +1501,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1519,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1542,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1636,13 +1630,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1672,7 +1665,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1684,7 +1677,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1700,7 +1693,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1751,7 +1744,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1780,7 +1773,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1803,7 +1796,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1893,13 +1886,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1929,7 +1921,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1941,7 +1933,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1957,7 +1949,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2008,7 +2000,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2026,7 +2018,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2049,7 +2041,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2137,13 +2129,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2173,7 +2164,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2185,7 +2176,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2201,7 +2192,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2252,7 +2243,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2282,7 +2273,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2307,7 +2298,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2406,13 +2397,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2442,7 +2432,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2454,7 +2444,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2470,7 +2460,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2521,7 +2511,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2536,7 +2526,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2557,7 +2547,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2624,13 +2614,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2660,7 +2649,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2672,7 +2661,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2688,7 +2677,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2739,7 +2728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2754,7 +2743,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2775,7 +2764,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2842,13 +2831,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2878,7 +2866,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2890,7 +2878,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2906,7 +2894,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2957,7 +2945,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2972,7 +2960,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2993,7 +2981,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3060,13 +3048,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3096,7 +3083,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3108,7 +3095,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3124,7 +3111,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3175,7 +3162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3204,7 +3191,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3227,7 +3214,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3305,13 +3292,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3341,7 +3327,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3353,7 +3339,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3369,7 +3355,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3388,7 +3374,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3417,7 +3403,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3440,7 +3426,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3518,13 +3504,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3554,7 +3539,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3566,7 +3551,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3582,7 +3567,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3601,7 +3586,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3635,7 +3620,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3660,7 +3645,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3747,13 +3732,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3783,7 +3767,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3795,7 +3779,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3811,7 +3795,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3830,7 +3814,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3859,7 +3843,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3882,7 +3866,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3969,13 +3953,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4005,7 +3988,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4017,7 +4000,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4033,7 +4016,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4084,7 +4067,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4146,7 +4129,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4195,7 +4178,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4353,13 +4336,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4393,7 +4375,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4405,7 +4387,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4421,7 +4403,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4446,7 +4428,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4502,7 +4484,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4539,7 +4521,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4682,13 +4664,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4718,7 +4699,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4730,7 +4711,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4746,7 +4727,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4771,7 +4752,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4794,7 +4775,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4827,7 +4808,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4948,13 +4929,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4988,7 +4968,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5000,7 +4980,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5016,7 +4996,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5035,7 +5015,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5064,7 +5044,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5087,7 +5067,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5165,13 +5145,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5201,7 +5180,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5213,7 +5192,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5229,7 +5208,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5248,7 +5227,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5277,7 +5256,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5300,7 +5279,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5378,13 +5357,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5414,7 +5392,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5426,7 +5404,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5442,7 +5420,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5461,7 +5439,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5495,7 +5473,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5520,7 +5498,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5601,13 +5579,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5637,7 +5614,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5649,7 +5626,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5665,7 +5642,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5684,7 +5661,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5745,7 +5722,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5784,7 +5761,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5891,13 +5868,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5927,7 +5903,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5939,7 +5915,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5955,7 +5931,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5974,7 +5950,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -6003,7 +5979,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6026,7 +6002,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6104,13 +6080,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6140,7 +6115,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6152,7 +6127,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6168,7 +6143,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6187,7 +6162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 980b7a0c1f89..19201e6173a3 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -316,13 +311,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -356,7 +350,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -368,7 +362,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -384,7 +378,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -435,7 +429,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs index 9d06e1ac4a9e..79331ea4b0ef 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -667,11 +668,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -716,7 +712,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -724,8 +720,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -758,7 +753,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -781,7 +776,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -881,13 +876,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -921,7 +915,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -933,7 +927,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -949,7 +943,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +962,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -998,7 +992,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1023,7 +1017,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1112,13 +1106,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1152,7 +1145,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1164,7 +1157,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1180,7 +1173,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1199,7 +1192,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1228,7 +1221,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1251,7 +1244,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1349,13 +1342,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1389,7 +1381,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1401,7 +1393,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1417,7 +1409,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1500,7 +1492,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1529,7 +1521,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1552,7 +1544,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1650,13 +1642,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1690,7 +1681,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1702,7 +1693,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1718,7 +1709,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1775,7 +1766,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1793,7 +1784,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1816,7 +1807,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1903,13 +1894,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1943,7 +1933,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1955,7 +1945,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1971,7 +1961,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2034,7 +2024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2063,7 +2053,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2086,7 +2076,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2180,13 +2170,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2220,7 +2209,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2232,7 +2221,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2248,7 +2237,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2279,7 +2268,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2314,7 +2303,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2341,7 +2330,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2435,13 +2424,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2475,7 +2463,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2487,7 +2475,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2503,7 +2491,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2522,7 +2510,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2557,7 +2545,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2584,7 +2572,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2695,13 +2683,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2735,7 +2722,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2747,7 +2734,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2763,7 +2750,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2814,7 +2801,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2849,7 +2836,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2876,7 +2863,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2987,13 +2974,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3027,7 +3013,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3039,7 +3025,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3055,7 +3041,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3106,7 +3092,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3136,7 +3122,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3161,7 +3147,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3266,13 +3252,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3306,7 +3291,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3318,7 +3303,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3334,7 +3319,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3385,7 +3370,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs index 08624b36f6ad..a91b3566ff25 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -293,11 +294,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -342,7 +338,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -350,8 +346,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -384,7 +379,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -407,7 +402,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -473,13 +468,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -509,7 +503,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -521,7 +515,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -537,7 +531,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -562,7 +556,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -577,7 +571,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -598,7 +592,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -670,13 +664,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -710,7 +703,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -722,7 +715,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -738,7 +731,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +782,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -807,7 +800,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -830,7 +823,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -904,13 +897,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -940,7 +932,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -952,7 +944,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +960,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1052,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1075,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1171,13 +1163,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1207,7 +1198,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1219,7 +1210,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1235,7 +1226,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1292,7 +1283,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs index c8536386fafb..278b5313c81f 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs @@ -22,6 +22,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -536,11 +537,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -590,7 +586,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -599,8 +595,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -634,7 +629,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -657,7 +652,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -735,13 +730,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -771,7 +765,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -783,7 +777,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -799,7 +793,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -818,7 +812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -847,7 +841,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -870,7 +864,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -948,13 +942,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -984,7 +977,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -996,7 +989,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1012,7 +1005,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1053,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1076,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1161,13 +1154,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1197,7 +1189,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1209,7 +1201,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1225,7 +1217,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1244,7 +1236,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1273,7 +1265,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1296,7 +1288,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1362,13 +1354,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1398,7 +1389,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1410,7 +1401,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1426,7 +1417,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1451,7 +1442,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1480,7 +1471,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1503,7 +1494,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1579,13 +1570,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1627,7 +1617,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1643,7 +1633,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1750,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1784,7 +1774,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1809,7 +1799,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1894,13 +1884,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1957,7 +1946,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1969,7 +1958,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1985,7 +1974,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2042,7 +2031,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2046,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2078,7 +2067,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2136,13 +2125,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2172,7 +2160,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2184,7 +2172,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2200,7 +2188,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2219,7 +2207,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2253,7 +2241,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2278,7 +2266,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2360,13 +2348,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2396,7 +2383,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2408,7 +2395,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2424,7 +2411,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2449,7 +2436,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.openapi-generator/FILES index e28da391730f..014d2e094f31 100644 --- a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/.openapi-generator/FILES @@ -32,6 +32,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/NowGet200Response.cs src/Org.OpenAPITools/Org.OpenAPITools.csproj src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs index 5c7e087ff74a..a38f90d14670 100644 --- a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterNowGetDefaultImplementation(INowGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterNowGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorNowGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorNowGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task NowGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); NowGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IN /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IN /// /// /// - public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public NowGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/AllOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/AllOf/.openapi-generator/FILES index 46a8286dea29..e32fc0acf018 100644 --- a/samples/client/petstore/csharp/generichost/net9/AllOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/AllOf/.openapi-generator/FILES @@ -36,6 +36,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Adult.cs src/Org.OpenAPITools/Model/Child.cs src/Org.OpenAPITools/Model/Person.cs diff --git a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 6e510044ff6f..9df512f32a87 100644 --- a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -130,11 +126,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -162,7 +157,7 @@ private void AfterListDefaultImplementation(IListApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterList(ref suppressDefaultLog, apiResponseLocalVar, personId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -185,7 +180,7 @@ private void OnErrorListDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorList(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, personId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -260,13 +255,12 @@ public async Task ListAsync(string personId, System.Threading. using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); ListApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/person/display/{personId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/person/display/{personId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -296,7 +290,7 @@ public partial class ListApiResponse : Org.OpenAPITools.Client.ApiResponse, ILis /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -308,7 +302,7 @@ public partial class ListApiResponse : Org.OpenAPITools.Client.ApiResponse, ILis /// /// /// - public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -324,7 +318,7 @@ public ListApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public ListApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -375,7 +369,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/AnyOf/.openapi-generator/FILES index 072cc8408121..470d4870ee92 100644 --- a/samples/client/petstore/csharp/generichost/net9/AnyOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/AnyOf/.openapi-generator/FILES @@ -36,6 +36,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 951a8589ef49..592c9c5898ef 100644 --- a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/.openapi-generator/FILES index 072cc8408121..470d4870ee92 100644 --- a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/.openapi-generator/FILES @@ -36,6 +36,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs index 951a8589ef49..592c9c5898ef 100644 --- a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES index 737d53400248..fd2691eb4794 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES @@ -179,6 +179,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 0de8a13cdbd7..4946f189d1b9 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -305,13 +300,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -341,7 +335,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -353,7 +347,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -369,7 +363,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -420,7 +414,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs index 5b43ed103210..59286835beb1 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -375,11 +376,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -424,7 +420,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -432,8 +428,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -452,7 +447,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -473,7 +468,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -540,13 +535,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -576,7 +570,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -588,7 +582,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -604,7 +598,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -655,7 +649,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -684,7 +678,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -707,7 +701,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -783,13 +777,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -819,7 +812,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -831,7 +824,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -847,7 +840,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -866,7 +859,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -881,7 +874,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -902,7 +895,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -969,13 +962,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1005,7 +997,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1017,7 +1009,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1033,7 +1025,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1084,7 +1076,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1099,7 +1091,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1120,7 +1112,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1187,13 +1179,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1223,7 +1214,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1235,7 +1226,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1251,7 +1242,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1308,7 +1299,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1323,7 +1314,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1344,7 +1335,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1411,13 +1402,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1447,7 +1437,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1459,7 +1449,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1475,7 +1465,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1526,7 +1516,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1541,7 +1531,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1562,7 +1552,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1629,13 +1619,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1665,7 +1654,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1677,7 +1666,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1693,7 +1682,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1744,7 +1733,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 6638ec4068d1..b74e8b5e7327 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1225,11 +1226,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1274,7 +1270,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1282,8 +1278,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1302,7 +1297,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1323,7 +1318,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1390,13 +1385,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1426,7 +1420,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1438,7 +1432,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1454,7 +1448,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1505,7 +1499,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1523,7 +1517,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1546,7 +1540,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1634,13 +1628,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1670,7 +1663,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1682,7 +1675,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1698,7 +1691,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1749,7 +1742,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1778,7 +1771,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1801,7 +1794,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1891,13 +1884,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1927,7 +1919,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1939,7 +1931,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1955,7 +1947,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2006,7 +1998,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2024,7 +2016,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2047,7 +2039,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2135,13 +2127,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2171,7 +2162,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2183,7 +2174,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2199,7 +2190,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2250,7 +2241,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2280,7 +2271,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2305,7 +2296,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2404,13 +2395,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2440,7 +2430,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2452,7 +2442,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2468,7 +2458,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2519,7 +2509,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2534,7 +2524,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2555,7 +2545,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2622,13 +2612,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2658,7 +2647,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2670,7 +2659,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2686,7 +2675,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2737,7 +2726,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2752,7 +2741,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2773,7 +2762,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2840,13 +2829,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2876,7 +2864,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2888,7 +2876,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2904,7 +2892,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2955,7 +2943,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2970,7 +2958,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2991,7 +2979,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3058,13 +3046,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3094,7 +3081,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3106,7 +3093,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3122,7 +3109,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3173,7 +3160,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3202,7 +3189,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3225,7 +3212,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3303,13 +3290,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3339,7 +3325,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3351,7 +3337,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3367,7 +3353,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3386,7 +3372,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3415,7 +3401,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3438,7 +3424,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3516,13 +3502,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3552,7 +3537,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3564,7 +3549,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3580,7 +3565,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3599,7 +3584,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3633,7 +3618,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3658,7 +3643,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3745,13 +3730,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3781,7 +3765,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3793,7 +3777,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3809,7 +3793,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3828,7 +3812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3857,7 +3841,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3880,7 +3864,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3967,13 +3951,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4003,7 +3986,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4015,7 +3998,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4031,7 +4014,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4082,7 +4065,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4144,7 +4127,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4193,7 +4176,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4351,13 +4334,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4391,7 +4373,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4403,7 +4385,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4419,7 +4401,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4444,7 +4426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4488,7 +4470,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4525,7 +4507,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4668,13 +4650,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4704,7 +4685,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4716,7 +4697,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4732,7 +4713,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4757,7 +4738,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4780,7 +4761,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4813,7 +4794,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4934,13 +4915,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4974,7 +4954,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4986,7 +4966,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5002,7 +4982,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5021,7 +5001,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5050,7 +5030,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5073,7 +5053,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5151,13 +5131,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5187,7 +5166,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5199,7 +5178,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5215,7 +5194,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5234,7 +5213,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5263,7 +5242,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5286,7 +5265,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5364,13 +5343,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5400,7 +5378,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5412,7 +5390,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5428,7 +5406,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5447,7 +5425,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5481,7 +5459,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5506,7 +5484,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5587,13 +5565,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5623,7 +5600,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5635,7 +5612,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5651,7 +5628,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5670,7 +5647,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5731,7 +5708,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5770,7 +5747,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5877,13 +5854,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5913,7 +5889,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5925,7 +5901,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5941,7 +5917,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5960,7 +5936,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5989,7 +5965,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6012,7 +5988,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6090,13 +6066,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6126,7 +6101,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6138,7 +6113,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6154,7 +6129,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6173,7 +6148,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 2813dbef14b7..fb834c1244ed 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -314,13 +309,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -354,7 +348,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -366,7 +360,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -382,7 +376,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -433,7 +427,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/PetApi.cs index 7a052a90d955..c636f7e6a084 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -665,11 +666,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -714,7 +710,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -722,8 +718,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -756,7 +751,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -779,7 +774,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -879,13 +874,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -919,7 +913,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -931,7 +925,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -947,7 +941,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +960,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -996,7 +990,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1021,7 +1015,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1110,13 +1104,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1150,7 +1143,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1162,7 +1155,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1178,7 +1171,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1197,7 +1190,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1226,7 +1219,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1249,7 +1242,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1347,13 +1340,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1387,7 +1379,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1399,7 +1391,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1415,7 +1407,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1498,7 +1490,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1527,7 +1519,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1550,7 +1542,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1648,13 +1640,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1688,7 +1679,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1700,7 +1691,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1716,7 +1707,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1773,7 +1764,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1791,7 +1782,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1814,7 +1805,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1901,13 +1892,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1941,7 +1931,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1953,7 +1943,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1969,7 +1959,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2032,7 +2022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2061,7 +2051,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2084,7 +2074,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2178,13 +2168,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2218,7 +2207,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2230,7 +2219,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2246,7 +2235,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2277,7 +2266,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2312,7 +2301,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2339,7 +2328,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2433,13 +2422,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2473,7 +2461,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2485,7 +2473,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2501,7 +2489,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2520,7 +2508,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2555,7 +2543,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2582,7 +2570,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2693,13 +2681,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2733,7 +2720,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2745,7 +2732,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2761,7 +2748,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2812,7 +2799,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2847,7 +2834,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2874,7 +2861,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2985,13 +2972,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3025,7 +3011,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3037,7 +3023,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3053,7 +3039,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3104,7 +3090,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3134,7 +3120,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3159,7 +3145,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3264,13 +3250,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3304,7 +3289,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3316,7 +3301,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3332,7 +3317,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3383,7 +3368,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs index f05331998ad1..3cbfda259a8b 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -291,11 +292,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -340,7 +336,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -348,8 +344,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -382,7 +377,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -405,7 +400,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -471,13 +466,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -507,7 +501,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -519,7 +513,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -535,7 +529,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -560,7 +554,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -575,7 +569,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -596,7 +590,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -668,13 +662,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -708,7 +701,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -720,7 +713,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -736,7 +729,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -787,7 +780,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -805,7 +798,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -828,7 +821,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -902,13 +895,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -938,7 +930,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -950,7 +942,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +958,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1021,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1050,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1073,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1169,13 +1161,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1205,7 +1196,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1217,7 +1208,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1233,7 +1224,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1290,7 +1281,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/UserApi.cs index ecdf56916766..097407c2d62a 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/UserApi.cs @@ -20,6 +20,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -534,11 +535,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -588,7 +584,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -597,8 +593,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -632,7 +627,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -655,7 +650,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -733,13 +728,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -769,7 +763,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -781,7 +775,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -797,7 +791,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -816,7 +810,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -845,7 +839,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -868,7 +862,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -946,13 +940,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -982,7 +975,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -994,7 +987,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1010,7 +1003,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1051,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1074,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1159,13 +1152,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1195,7 +1187,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1207,7 +1199,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1223,7 +1215,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1242,7 +1234,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1271,7 +1263,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1294,7 +1286,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1360,13 +1352,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1396,7 +1387,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1408,7 +1399,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1424,7 +1415,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1449,7 +1440,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1478,7 +1469,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1501,7 +1492,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1577,13 +1568,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1613,7 +1603,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1625,7 +1615,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1641,7 +1631,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1748,7 +1738,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1782,7 +1772,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1807,7 +1797,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1892,13 +1882,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1955,7 +1944,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1967,7 +1956,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1983,7 +1972,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2040,7 +2029,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2055,7 +2044,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2076,7 +2065,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2134,13 +2123,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2170,7 +2158,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2182,7 +2170,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2198,7 +2186,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2217,7 +2205,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2251,7 +2239,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2276,7 +2264,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2358,13 +2346,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2394,7 +2381,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2406,7 +2393,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2422,7 +2409,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2447,7 +2434,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES index a3e02b328e0a..3a66c0df35db 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/.openapi-generator/FILES @@ -154,6 +154,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 04b8da36fe38..8c27696f8420 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -307,13 +302,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -343,7 +337,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -355,7 +349,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -371,7 +365,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -422,7 +416,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs index 23e4f720a4b2..00f9455abbba 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -377,11 +378,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -426,7 +422,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -434,8 +430,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -454,7 +449,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -475,7 +470,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -542,13 +537,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -578,7 +572,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -590,7 +584,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -606,7 +600,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -657,7 +651,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -686,7 +680,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -709,7 +703,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -785,13 +779,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -821,7 +814,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -833,7 +826,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -849,7 +842,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -868,7 +861,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -883,7 +876,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -904,7 +897,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -971,13 +964,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1007,7 +999,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1019,7 +1011,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1035,7 +1027,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1086,7 +1078,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1101,7 +1093,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1122,7 +1114,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1189,13 +1181,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1225,7 +1216,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1237,7 +1228,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1253,7 +1244,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1310,7 +1301,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1325,7 +1316,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1346,7 +1337,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1413,13 +1404,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1449,7 +1439,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1461,7 +1451,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1477,7 +1467,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1528,7 +1518,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1543,7 +1533,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1564,7 +1554,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1631,13 +1621,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1667,7 +1656,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1679,7 +1668,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1695,7 +1684,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1746,7 +1735,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs index 9242390191ce..3e7893ff2380 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1227,11 +1228,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1276,7 +1272,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1284,8 +1280,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1304,7 +1299,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1325,7 +1320,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1392,13 +1387,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1428,7 +1422,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1440,7 +1434,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1456,7 +1450,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1507,7 +1501,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1519,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1542,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1636,13 +1630,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1672,7 +1665,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1684,7 +1677,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1700,7 +1693,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1751,7 +1744,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1780,7 +1773,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1803,7 +1796,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1893,13 +1886,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1929,7 +1921,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1941,7 +1933,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1957,7 +1949,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2008,7 +2000,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2026,7 +2018,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2049,7 +2041,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2137,13 +2129,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2173,7 +2164,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2185,7 +2176,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2201,7 +2192,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2252,7 +2243,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2282,7 +2273,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2307,7 +2298,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2406,13 +2397,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2442,7 +2432,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2454,7 +2444,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2470,7 +2460,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2521,7 +2511,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2536,7 +2526,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2557,7 +2547,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2624,13 +2614,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2660,7 +2649,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2672,7 +2661,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2688,7 +2677,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2739,7 +2728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2754,7 +2743,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2775,7 +2764,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2842,13 +2831,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2878,7 +2866,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2890,7 +2878,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2906,7 +2894,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2957,7 +2945,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2972,7 +2960,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2993,7 +2981,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3060,13 +3048,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3096,7 +3083,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3108,7 +3095,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3124,7 +3111,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3175,7 +3162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3204,7 +3191,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3227,7 +3214,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3305,13 +3292,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3341,7 +3327,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3353,7 +3339,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3369,7 +3355,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3388,7 +3374,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3417,7 +3403,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3440,7 +3426,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3518,13 +3504,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3554,7 +3539,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3566,7 +3551,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3582,7 +3567,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3601,7 +3586,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3635,7 +3620,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3660,7 +3645,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3747,13 +3732,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3783,7 +3767,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3795,7 +3779,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3811,7 +3795,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3830,7 +3814,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3859,7 +3843,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3882,7 +3866,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3969,13 +3953,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4005,7 +3988,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4017,7 +4000,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4033,7 +4016,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4084,7 +4067,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4146,7 +4129,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4195,7 +4178,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4353,13 +4336,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4393,7 +4375,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4405,7 +4387,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4421,7 +4403,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4446,7 +4428,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4502,7 +4484,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4539,7 +4521,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4682,13 +4664,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4718,7 +4699,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4730,7 +4711,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4746,7 +4727,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4771,7 +4752,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4794,7 +4775,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4827,7 +4808,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4948,13 +4929,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4988,7 +4968,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5000,7 +4980,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5016,7 +4996,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5035,7 +5015,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5064,7 +5044,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5087,7 +5067,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5165,13 +5145,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5201,7 +5180,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5213,7 +5192,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5229,7 +5208,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5248,7 +5227,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5277,7 +5256,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5300,7 +5279,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5378,13 +5357,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5414,7 +5392,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5426,7 +5404,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5442,7 +5420,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5461,7 +5439,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5495,7 +5473,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5520,7 +5498,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5601,13 +5579,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5637,7 +5614,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5649,7 +5626,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5665,7 +5642,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5684,7 +5661,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5745,7 +5722,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5784,7 +5761,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5891,13 +5868,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5927,7 +5903,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5939,7 +5915,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5955,7 +5931,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5974,7 +5950,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -6003,7 +5979,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6026,7 +6002,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6104,13 +6080,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6140,7 +6115,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6152,7 +6127,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6168,7 +6143,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6187,7 +6162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 980b7a0c1f89..19201e6173a3 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -316,13 +311,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -356,7 +350,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -368,7 +362,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -384,7 +378,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -435,7 +429,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs index 9d06e1ac4a9e..79331ea4b0ef 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/PetApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -667,11 +668,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -716,7 +712,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -724,8 +720,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -758,7 +753,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -781,7 +776,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -881,13 +876,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -921,7 +915,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -933,7 +927,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -949,7 +943,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +962,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -998,7 +992,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1023,7 +1017,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1112,13 +1106,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1152,7 +1145,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1164,7 +1157,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1180,7 +1173,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1199,7 +1192,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1228,7 +1221,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1251,7 +1244,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1349,13 +1342,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1389,7 +1381,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1401,7 +1393,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1417,7 +1409,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1500,7 +1492,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1529,7 +1521,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1552,7 +1544,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1650,13 +1642,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1690,7 +1681,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1702,7 +1693,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1718,7 +1709,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1775,7 +1766,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1793,7 +1784,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1816,7 +1807,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1903,13 +1894,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1943,7 +1933,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1955,7 +1945,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1971,7 +1961,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2034,7 +2024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2063,7 +2053,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2086,7 +2076,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2180,13 +2170,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2220,7 +2209,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2232,7 +2221,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2248,7 +2237,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2279,7 +2268,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2314,7 +2303,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2341,7 +2330,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2435,13 +2424,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2475,7 +2463,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2487,7 +2475,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2503,7 +2491,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2522,7 +2510,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2557,7 +2545,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2584,7 +2572,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2695,13 +2683,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2735,7 +2722,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2747,7 +2734,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2763,7 +2750,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2814,7 +2801,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2849,7 +2836,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2876,7 +2863,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2987,13 +2974,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3027,7 +3013,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3039,7 +3025,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3055,7 +3041,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3106,7 +3092,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3136,7 +3122,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3161,7 +3147,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3266,13 +3252,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3306,7 +3291,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3318,7 +3303,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3334,7 +3319,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3385,7 +3370,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs index 08624b36f6ad..a91b3566ff25 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/StoreApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -293,11 +294,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -342,7 +338,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -350,8 +346,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -384,7 +379,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -407,7 +402,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -473,13 +468,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -509,7 +503,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -521,7 +515,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -537,7 +531,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -562,7 +556,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -577,7 +571,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -598,7 +592,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -670,13 +664,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -710,7 +703,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -722,7 +715,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -738,7 +731,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +782,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -807,7 +800,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -830,7 +823,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -904,13 +897,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -940,7 +932,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -952,7 +944,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +960,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1052,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1075,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1171,13 +1163,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1207,7 +1198,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1219,7 +1210,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1235,7 +1226,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1292,7 +1283,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs index c8536386fafb..278b5313c81f 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Api/UserApi.cs @@ -22,6 +22,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -536,11 +537,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -590,7 +586,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -599,8 +595,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -634,7 +629,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -657,7 +652,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -735,13 +730,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -771,7 +765,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -783,7 +777,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -799,7 +793,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -818,7 +812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -847,7 +841,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -870,7 +864,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -948,13 +942,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -984,7 +977,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -996,7 +989,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1012,7 +1005,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1053,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1076,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1161,13 +1154,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1197,7 +1189,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1209,7 +1201,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1225,7 +1217,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1244,7 +1236,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1273,7 +1265,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1296,7 +1288,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1362,13 +1354,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1398,7 +1389,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1410,7 +1401,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1426,7 +1417,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1451,7 +1442,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1480,7 +1471,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1503,7 +1494,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1579,13 +1570,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1627,7 +1617,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1643,7 +1633,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1750,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1784,7 +1774,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1809,7 +1799,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1894,13 +1884,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1957,7 +1946,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1969,7 +1958,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1985,7 +1974,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2042,7 +2031,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2046,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2078,7 +2067,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2136,13 +2125,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2172,7 +2160,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2184,7 +2172,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2200,7 +2188,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2219,7 +2207,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2253,7 +2241,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2278,7 +2266,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2360,13 +2348,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2396,7 +2383,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2408,7 +2395,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2424,7 +2411,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2449,7 +2436,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/OneOf/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/OneOf/.openapi-generator/FILES index cfb76c7ed0ac..de14bc5e5e2a 100644 --- a/samples/client/petstore/csharp/generichost/net9/OneOf/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/OneOf/.openapi-generator/FILES @@ -37,6 +37,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Apple.cs src/Org.OpenAPITools/Model/Banana.cs src/Org.OpenAPITools/Model/Fruit.cs diff --git a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 951a8589ef49..592c9c5898ef 100644 --- a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterRootGetDefaultImplementation(IRootGetApiResponse apiResponseLo bool suppressDefaultLog = false; AfterRootGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorRootGetDefaultImplementation(Exception exceptionLocalVar, st bool suppressDefaultLogLocalVar = false; OnErrorRootGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task RootGetAsync(System.Threading.Cancellatio using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RootGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class RootGetApiResponse : Org.OpenAPITools.Client.ApiResponse, I /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public RootGetApiResponse(ILogger logger, System.Net.Http.Ht /// /// /// - public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RootGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES index a3e02b328e0a..3a66c0df35db 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/.openapi-generator/FILES @@ -154,6 +154,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 0de8a13cdbd7..4946f189d1b9 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -305,13 +300,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -341,7 +335,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -353,7 +347,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -369,7 +363,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -420,7 +414,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index 5b43ed103210..59286835beb1 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -375,11 +376,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -424,7 +420,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -432,8 +428,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -452,7 +447,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -473,7 +468,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -540,13 +535,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -576,7 +570,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -588,7 +582,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -604,7 +598,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -655,7 +649,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -684,7 +678,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -707,7 +701,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -783,13 +777,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -819,7 +812,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -831,7 +824,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -847,7 +840,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -866,7 +859,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -881,7 +874,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -902,7 +895,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -969,13 +962,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1005,7 +997,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1017,7 +1009,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1033,7 +1025,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1084,7 +1076,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1099,7 +1091,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1120,7 +1112,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1187,13 +1179,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1223,7 +1214,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1235,7 +1226,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1251,7 +1242,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1308,7 +1299,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1323,7 +1314,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1344,7 +1335,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1411,13 +1402,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1447,7 +1437,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1459,7 +1449,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1475,7 +1465,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1526,7 +1516,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1541,7 +1531,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1562,7 +1552,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1629,13 +1619,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1665,7 +1654,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1677,7 +1666,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1693,7 +1682,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1744,7 +1733,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index 46b99593f1d7..7ba4ebd49ce9 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1225,11 +1226,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1274,7 +1270,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1282,8 +1278,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1302,7 +1297,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1323,7 +1318,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1390,13 +1385,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1426,7 +1420,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1438,7 +1432,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1454,7 +1448,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1505,7 +1499,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1523,7 +1517,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1546,7 +1540,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1634,13 +1628,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1670,7 +1663,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1682,7 +1675,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1698,7 +1691,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1749,7 +1742,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1778,7 +1771,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1801,7 +1794,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1891,13 +1884,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1927,7 +1919,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1939,7 +1931,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1955,7 +1947,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2006,7 +1998,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2024,7 +2016,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2047,7 +2039,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2135,13 +2127,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2171,7 +2162,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2183,7 +2174,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2199,7 +2190,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2250,7 +2241,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2280,7 +2271,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2305,7 +2296,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2404,13 +2395,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2440,7 +2430,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2452,7 +2442,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2468,7 +2458,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2519,7 +2509,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2534,7 +2524,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2555,7 +2545,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2622,13 +2612,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2658,7 +2647,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2670,7 +2659,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2686,7 +2675,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2737,7 +2726,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2752,7 +2741,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2773,7 +2762,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2840,13 +2829,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2876,7 +2864,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2888,7 +2876,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2904,7 +2892,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2955,7 +2943,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2970,7 +2958,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2991,7 +2979,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3058,13 +3046,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3094,7 +3081,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3106,7 +3093,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3122,7 +3109,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3173,7 +3160,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3202,7 +3189,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3225,7 +3212,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3303,13 +3290,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3339,7 +3325,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3351,7 +3337,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3367,7 +3353,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3386,7 +3372,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3415,7 +3401,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3438,7 +3424,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3516,13 +3502,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3552,7 +3537,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3564,7 +3549,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3580,7 +3565,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3599,7 +3584,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3633,7 +3618,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3658,7 +3643,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3745,13 +3730,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3781,7 +3765,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3793,7 +3777,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3809,7 +3793,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3828,7 +3812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3857,7 +3841,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3880,7 +3864,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3967,13 +3951,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4003,7 +3986,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4015,7 +3998,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4031,7 +4014,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4082,7 +4065,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4144,7 +4127,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4193,7 +4176,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4351,13 +4334,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4391,7 +4373,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4403,7 +4385,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4419,7 +4401,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4444,7 +4426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4500,7 +4482,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4537,7 +4519,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4680,13 +4662,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4716,7 +4697,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4728,7 +4709,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4744,7 +4725,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4769,7 +4750,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4792,7 +4773,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4825,7 +4806,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4946,13 +4927,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4986,7 +4966,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4998,7 +4978,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5014,7 +4994,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5033,7 +5013,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5062,7 +5042,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5085,7 +5065,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5163,13 +5143,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5199,7 +5178,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5211,7 +5190,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5227,7 +5206,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5246,7 +5225,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5275,7 +5254,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5298,7 +5277,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5376,13 +5355,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5412,7 +5390,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5424,7 +5402,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5440,7 +5418,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5459,7 +5437,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5493,7 +5471,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5518,7 +5496,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5599,13 +5577,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5635,7 +5612,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5647,7 +5624,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5663,7 +5640,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5682,7 +5659,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5743,7 +5720,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5782,7 +5759,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5889,13 +5866,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5925,7 +5901,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5937,7 +5913,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5953,7 +5929,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5972,7 +5948,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -6001,7 +5977,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6024,7 +6000,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6102,13 +6078,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6138,7 +6113,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6150,7 +6125,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6166,7 +6141,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6185,7 +6160,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 2813dbef14b7..fb834c1244ed 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -153,7 +149,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -161,8 +157,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -195,7 +190,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -218,7 +213,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -314,13 +309,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -354,7 +348,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -366,7 +360,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -382,7 +376,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -433,7 +427,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index 0843443b2ae3..75999a1c5f60 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -665,11 +666,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -714,7 +710,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -722,8 +718,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -756,7 +751,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -779,7 +774,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -879,13 +874,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -919,7 +913,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -931,7 +925,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -947,7 +941,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +960,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -996,7 +990,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1021,7 +1015,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1110,13 +1104,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1150,7 +1143,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1162,7 +1155,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1178,7 +1171,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1197,7 +1190,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1226,7 +1219,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1249,7 +1242,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1347,13 +1340,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1387,7 +1379,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1399,7 +1391,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1415,7 +1407,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1498,7 +1490,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1527,7 +1519,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1550,7 +1542,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1648,13 +1640,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1688,7 +1679,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1700,7 +1691,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1716,7 +1707,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1773,7 +1764,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1791,7 +1782,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1814,7 +1805,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1901,13 +1892,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1941,7 +1931,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1953,7 +1943,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1969,7 +1959,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2032,7 +2022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2061,7 +2051,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2084,7 +2074,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2178,13 +2168,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2218,7 +2207,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2230,7 +2219,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2246,7 +2235,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2277,7 +2266,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2312,7 +2301,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2339,7 +2328,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2433,13 +2422,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2473,7 +2461,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2485,7 +2473,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2501,7 +2489,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2520,7 +2508,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2555,7 +2543,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2582,7 +2570,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2693,13 +2681,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2733,7 +2720,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2745,7 +2732,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2761,7 +2748,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2812,7 +2799,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2847,7 +2834,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2874,7 +2861,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2985,13 +2972,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3025,7 +3011,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3037,7 +3023,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3053,7 +3039,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3104,7 +3090,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3134,7 +3120,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3159,7 +3145,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3264,13 +3250,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3304,7 +3289,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3316,7 +3301,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3332,7 +3317,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3383,7 +3368,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs index f05331998ad1..3cbfda259a8b 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -291,11 +292,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -340,7 +336,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -348,8 +344,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -382,7 +377,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -405,7 +400,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -471,13 +466,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -507,7 +501,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -519,7 +513,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -535,7 +529,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -560,7 +554,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -575,7 +569,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -596,7 +590,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -668,13 +662,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -708,7 +701,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -720,7 +713,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -736,7 +729,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -787,7 +780,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -805,7 +798,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -828,7 +821,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -902,13 +895,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -938,7 +930,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -950,7 +942,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -966,7 +958,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1021,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1050,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1073,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1169,13 +1161,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1205,7 +1196,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1217,7 +1208,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1233,7 +1224,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1290,7 +1281,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index ecdf56916766..097407c2d62a 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -20,6 +20,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -534,11 +535,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -588,7 +584,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -597,8 +593,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -632,7 +627,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -655,7 +650,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -733,13 +728,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -769,7 +763,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -781,7 +775,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -797,7 +791,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -816,7 +810,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -845,7 +839,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -868,7 +862,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -946,13 +940,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -982,7 +975,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -994,7 +987,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1010,7 +1003,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1029,7 +1022,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1058,7 +1051,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1081,7 +1074,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1159,13 +1152,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1195,7 +1187,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1207,7 +1199,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1223,7 +1215,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1242,7 +1234,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1271,7 +1263,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1294,7 +1286,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1360,13 +1352,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1396,7 +1387,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1408,7 +1399,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1424,7 +1415,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1449,7 +1440,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1478,7 +1469,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1501,7 +1492,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1577,13 +1568,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1613,7 +1603,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1625,7 +1615,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1641,7 +1631,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1748,7 +1738,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1782,7 +1772,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1807,7 +1797,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1892,13 +1882,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1955,7 +1944,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1967,7 +1956,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1983,7 +1972,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2040,7 +2029,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2055,7 +2044,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2076,7 +2065,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2134,13 +2123,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2170,7 +2158,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2182,7 +2170,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2198,7 +2186,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2217,7 +2205,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2251,7 +2239,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2276,7 +2264,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2358,13 +2346,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2394,7 +2381,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2406,7 +2393,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2422,7 +2409,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2447,7 +2434,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES index a3e02b328e0a..3a66c0df35db 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/.openapi-generator/FILES @@ -154,6 +154,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 04b8da36fe38..8c27696f8420 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -307,13 +302,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -343,7 +337,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -355,7 +349,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -371,7 +365,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -422,7 +416,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs index 23e4f720a4b2..00f9455abbba 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -377,11 +378,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -426,7 +422,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -434,8 +430,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -454,7 +449,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -475,7 +470,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -542,13 +537,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -578,7 +572,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -590,7 +584,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -606,7 +600,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -657,7 +651,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -686,7 +680,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -709,7 +703,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -785,13 +779,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -821,7 +814,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -833,7 +826,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -849,7 +842,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -868,7 +861,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -883,7 +876,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -904,7 +897,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -971,13 +964,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1007,7 +999,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1019,7 +1011,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1035,7 +1027,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1086,7 +1078,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1101,7 +1093,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1122,7 +1114,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1189,13 +1181,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1225,7 +1216,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1237,7 +1228,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1253,7 +1244,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1310,7 +1301,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1325,7 +1316,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1346,7 +1337,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1413,13 +1404,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1449,7 +1439,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1461,7 +1451,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1477,7 +1467,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1528,7 +1518,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1543,7 +1533,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1564,7 +1554,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1631,13 +1621,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1667,7 +1656,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1679,7 +1668,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1695,7 +1684,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1746,7 +1735,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs index 9242390191ce..3e7893ff2380 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -1227,11 +1228,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1276,7 +1272,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1284,8 +1280,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1304,7 +1299,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1325,7 +1320,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1392,13 +1387,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1428,7 +1422,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1440,7 +1434,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1456,7 +1450,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1507,7 +1501,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1525,7 +1519,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1548,7 +1542,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1636,13 +1630,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1672,7 +1665,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1684,7 +1677,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1700,7 +1693,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1751,7 +1744,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1780,7 +1773,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1803,7 +1796,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1893,13 +1886,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1929,7 +1921,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1941,7 +1933,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1957,7 +1949,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2008,7 +2000,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2026,7 +2018,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2049,7 +2041,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2137,13 +2129,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2173,7 +2164,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2185,7 +2176,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2201,7 +2192,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2252,7 +2243,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2282,7 +2273,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2307,7 +2298,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2406,13 +2397,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2442,7 +2432,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2454,7 +2444,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2470,7 +2460,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2521,7 +2511,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2536,7 +2526,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2557,7 +2547,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2624,13 +2614,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2660,7 +2649,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2672,7 +2661,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2688,7 +2677,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2739,7 +2728,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2754,7 +2743,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2775,7 +2764,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2842,13 +2831,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2878,7 +2866,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2890,7 +2878,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2906,7 +2894,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2957,7 +2945,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2972,7 +2960,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2993,7 +2981,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3060,13 +3048,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3096,7 +3083,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3108,7 +3095,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3124,7 +3111,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3175,7 +3162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3204,7 +3191,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3227,7 +3214,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3305,13 +3292,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3341,7 +3327,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3353,7 +3339,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3369,7 +3355,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3388,7 +3374,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3417,7 +3403,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3440,7 +3426,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3518,13 +3504,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3554,7 +3539,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3566,7 +3551,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3582,7 +3567,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3601,7 +3586,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3635,7 +3620,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3660,7 +3645,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3747,13 +3732,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3783,7 +3767,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3795,7 +3779,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3811,7 +3795,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3830,7 +3814,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3859,7 +3843,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3882,7 +3866,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3969,13 +3953,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4005,7 +3988,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4017,7 +4000,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4033,7 +4016,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4084,7 +4067,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4146,7 +4129,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4195,7 +4178,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4353,13 +4336,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4393,7 +4375,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4405,7 +4387,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4421,7 +4403,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4446,7 +4428,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4502,7 +4484,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4539,7 +4521,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4682,13 +4664,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4718,7 +4699,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4730,7 +4711,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4746,7 +4727,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4771,7 +4752,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4794,7 +4775,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4827,7 +4808,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4948,13 +4929,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4988,7 +4968,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5000,7 +4980,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5016,7 +4996,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5035,7 +5015,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5064,7 +5044,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5087,7 +5067,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5165,13 +5145,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5201,7 +5180,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5213,7 +5192,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5229,7 +5208,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5248,7 +5227,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5277,7 +5256,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5300,7 +5279,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5378,13 +5357,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5414,7 +5392,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5426,7 +5404,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5442,7 +5420,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5461,7 +5439,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5495,7 +5473,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5520,7 +5498,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5601,13 +5579,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5637,7 +5614,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5649,7 +5626,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5665,7 +5642,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5684,7 +5661,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5745,7 +5722,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5784,7 +5761,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5891,13 +5868,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5927,7 +5903,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5939,7 +5915,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5955,7 +5931,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5974,7 +5950,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -6003,7 +5979,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6026,7 +6002,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6104,13 +6080,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6140,7 +6115,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6152,7 +6127,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6168,7 +6143,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6187,7 +6162,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 980b7a0c1f89..19201e6173a3 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -106,11 +107,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -155,7 +151,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -163,8 +159,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -197,7 +192,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -220,7 +215,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -316,13 +311,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -356,7 +350,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -368,7 +362,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -384,7 +378,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -435,7 +429,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs index 9d06e1ac4a9e..79331ea4b0ef 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/PetApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -667,11 +668,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -716,7 +712,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -724,8 +720,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -758,7 +753,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -781,7 +776,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -881,13 +876,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -921,7 +915,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -933,7 +927,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -949,7 +943,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +962,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -998,7 +992,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1023,7 +1017,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1112,13 +1106,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1152,7 +1145,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1164,7 +1157,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1180,7 +1173,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1199,7 +1192,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1228,7 +1221,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1251,7 +1244,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1349,13 +1342,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1389,7 +1381,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1401,7 +1393,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1417,7 +1409,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1500,7 +1492,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1529,7 +1521,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1552,7 +1544,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1650,13 +1642,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1690,7 +1681,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1702,7 +1693,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1718,7 +1709,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1775,7 +1766,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1793,7 +1784,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1816,7 +1807,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1903,13 +1894,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1943,7 +1933,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1955,7 +1945,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1971,7 +1961,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2034,7 +2024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2063,7 +2053,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2086,7 +2076,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2180,13 +2170,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2220,7 +2209,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2232,7 +2221,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2248,7 +2237,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2279,7 +2268,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2314,7 +2303,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2341,7 +2330,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2435,13 +2424,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2475,7 +2463,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2487,7 +2475,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2503,7 +2491,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2522,7 +2510,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2557,7 +2545,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2584,7 +2572,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2695,13 +2683,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2735,7 +2722,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2747,7 +2734,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2763,7 +2750,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2814,7 +2801,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2849,7 +2836,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2876,7 +2863,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2987,13 +2974,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3027,7 +3013,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3039,7 +3025,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3055,7 +3041,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3106,7 +3092,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3136,7 +3122,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3161,7 +3147,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3266,13 +3252,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3306,7 +3291,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3318,7 +3303,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3334,7 +3319,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3385,7 +3370,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs index 08624b36f6ad..a91b3566ff25 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/StoreApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -293,11 +294,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -342,7 +338,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -350,8 +346,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -384,7 +379,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -407,7 +402,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -473,13 +468,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -509,7 +503,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -521,7 +515,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -537,7 +531,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -562,7 +556,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -577,7 +571,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -598,7 +592,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -670,13 +664,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -710,7 +703,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -722,7 +715,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -738,7 +731,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -789,7 +782,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -807,7 +800,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -830,7 +823,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -904,13 +897,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -940,7 +932,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -952,7 +944,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -968,7 +960,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1023,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1052,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1075,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1171,13 +1163,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1207,7 +1198,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1219,7 +1210,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1235,7 +1226,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1292,7 +1283,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs index c8536386fafb..278b5313c81f 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Api/UserApi.cs @@ -22,6 +22,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -536,11 +537,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -590,7 +586,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -599,8 +595,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient Org.OpenAPITools.Client.CookieContainer cookieContainer) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -634,7 +629,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -657,7 +652,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -735,13 +730,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -771,7 +765,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -783,7 +777,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -799,7 +793,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -818,7 +812,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -847,7 +841,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -870,7 +864,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -948,13 +942,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -984,7 +977,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -996,7 +989,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1012,7 +1005,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1031,7 +1024,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1060,7 +1053,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1083,7 +1076,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1161,13 +1154,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1197,7 +1189,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1209,7 +1201,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1225,7 +1217,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1244,7 +1236,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1273,7 +1265,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1296,7 +1288,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1362,13 +1354,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1398,7 +1389,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1410,7 +1401,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1426,7 +1417,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1451,7 +1442,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1480,7 +1471,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1503,7 +1494,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1579,13 +1570,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1615,7 +1605,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1627,7 +1617,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1643,7 +1633,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1750,7 +1740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1784,7 +1774,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1809,7 +1799,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1894,13 +1884,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1957,7 +1946,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1969,7 +1958,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1985,7 +1974,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2042,7 +2031,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2057,7 +2046,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2078,7 +2067,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2136,13 +2125,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2172,7 +2160,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2184,7 +2172,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2200,7 +2188,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2219,7 +2207,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2253,7 +2241,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2278,7 +2266,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2360,13 +2348,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2396,7 +2383,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2408,7 +2395,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2424,7 +2411,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2449,7 +2436,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/.openapi-generator/FILES index e28da391730f..014d2e094f31 100644 --- a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/.openapi-generator/FILES @@ -32,6 +32,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/NowGet200Response.cs src/Org.OpenAPITools/Org.OpenAPITools.csproj src/Org.OpenAPITools/README.md diff --git a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs index 5c7e087ff74a..a38f90d14670 100644 --- a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -21,6 +21,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; using System.Diagnostics.CodeAnalysis; @@ -104,11 +105,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -128,11 +124,10 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; } @@ -146,7 +141,7 @@ private void AfterNowGetDefaultImplementation(INowGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterNowGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -167,7 +162,7 @@ private void OnErrorNowGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorNowGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -234,13 +229,12 @@ public async Task NowGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); NowGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - apiResponseLocalVar = new(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/now", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -270,7 +264,7 @@ public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IN /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -282,7 +276,7 @@ public partial class NowGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IN /// /// /// - public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -298,7 +292,7 @@ public NowGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public NowGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -349,7 +343,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES index 82501a149e01..20a67a4fabae 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/.openapi-generator/FILES @@ -152,6 +152,7 @@ src/Org.OpenAPITools/Client/TokenProvider`1.cs src/Org.OpenAPITools/Extensions/IHostBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IHttpClientBuilderExtensions.cs src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +src/Org.OpenAPITools/Logging/RestLogEvents.cs src/Org.OpenAPITools/Model/Activity.cs src/Org.OpenAPITools/Model/ActivityOutputElementRepresentation.cs src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 6eb8990489ae..2f4dcd8f5431 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Api @@ -103,11 +104,6 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -152,7 +148,7 @@ public sealed partial class AnotherFakeApi : IAnotherFakeApi /// Initializes a new instance of the class. /// /// - public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, + public AnotherFakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, AnotherFakeApiEvents anotherFakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -160,8 +156,7 @@ public AnotherFakeApi(ILogger logger, ILoggerFactory loggerFacto TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = anotherFakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -194,7 +189,7 @@ private void AfterCall123TestSpecialTagsDefaultImplementation(ICall123TestSpecia bool suppressDefaultLog = false; AfterCall123TestSpecialTags(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -217,7 +212,7 @@ private void OnErrorCall123TestSpecialTagsDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorCall123TestSpecialTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -303,13 +298,12 @@ public async Task Call123TestSpecialTagsAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); Call123TestSpecialTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new Call123TestSpecialTagsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new Call123TestSpecialTagsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/another-fake/dummy", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -339,7 +333,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -351,7 +345,7 @@ public partial class Call123TestSpecialTagsApiResponse : Org.OpenAPITools.Client /// /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -367,7 +361,7 @@ public Call123TestSpecialTagsApiResponse(ILogger /// /// - public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public Call123TestSpecialTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -418,7 +412,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs index dc821468334b..478c7af87d11 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Api @@ -374,11 +375,6 @@ public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -423,7 +419,7 @@ public sealed partial class DefaultApi : IDefaultApi /// Initializes a new instance of the class. /// /// - public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, + public DefaultApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, DefaultApiEvents defaultApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -431,8 +427,7 @@ public DefaultApi(ILogger logger, ILoggerFactory loggerFactory, Http TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = defaultApiEvents; ApiKeyProvider = apiKeyProvider; @@ -451,7 +446,7 @@ private void AfterFooGetDefaultImplementation(IFooGetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterFooGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -472,7 +467,7 @@ private void OnErrorFooGetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorFooGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -538,13 +533,12 @@ public async Task FooGetAsync(System.Threading.CancellationT using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FooGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FooGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FooGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/foo", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -574,7 +568,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -586,7 +580,7 @@ public partial class FooGetApiResponse : Org.OpenAPITools.Client.ApiResponse, IF /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -602,7 +596,7 @@ public FooGetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FooGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -653,7 +647,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -682,7 +676,7 @@ private void AfterGetCountryDefaultImplementation(IGetCountryApiResponse apiResp bool suppressDefaultLog = false; AfterGetCountry(ref suppressDefaultLog, apiResponseLocalVar, country); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -705,7 +699,7 @@ private void OnErrorGetCountryDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetCountry(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, country); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -781,13 +775,12 @@ public async Task GetCountryAsync(string country, System using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetCountryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetCountryApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetCountryApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/country", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -817,7 +810,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -829,7 +822,7 @@ public partial class GetCountryApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -845,7 +838,7 @@ public GetCountryApiResponse(ILogger logger, System.Net.H /// /// /// - public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetCountryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -864,7 +857,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -879,7 +872,7 @@ private void AfterHelloDefaultImplementation(IHelloApiResponse apiResponseLocalV bool suppressDefaultLog = false; AfterHello(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -900,7 +893,7 @@ private void OnErrorHelloDefaultImplementation(Exception exceptionLocalVar, stri bool suppressDefaultLogLocalVar = false; OnErrorHello(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -966,13 +959,12 @@ public async Task HelloAsync(System.Threading.CancellationTok using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); HelloApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new HelloApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new HelloApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/hello", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1002,7 +994,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1014,7 +1006,7 @@ public partial class HelloApiResponse : Org.OpenAPITools.Client.ApiResponse, IHe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1030,7 +1022,7 @@ public HelloApiResponse(ILogger logger, System.Net.Http.HttpRe /// /// /// - public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public HelloApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1081,7 +1073,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1096,7 +1088,7 @@ private void AfterRedirectOrDefaultDefaultImplementation(IRedirectOrDefaultApiRe bool suppressDefaultLog = false; AfterRedirectOrDefault(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1117,7 +1109,7 @@ private void OnErrorRedirectOrDefaultDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorRedirectOrDefault(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1183,13 +1175,12 @@ public async Task RedirectOrDefaultAsync(System.T using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RedirectOrDefaultApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RedirectOrDefaultApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RedirectOrDefaultApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/redirectOrDefault", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1219,7 +1210,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1231,7 +1222,7 @@ public partial class RedirectOrDefaultApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1247,7 +1238,7 @@ public RedirectOrDefaultApiResponse(ILogger logger /// /// /// - public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RedirectOrDefaultApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1304,7 +1295,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1319,7 +1310,7 @@ private void AfterRolesReportGetDefaultImplementation(IRolesReportGetApiResponse bool suppressDefaultLog = false; AfterRolesReportGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1340,7 +1331,7 @@ private void OnErrorRolesReportGetDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorRolesReportGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1406,13 +1397,12 @@ public async Task RolesReportGetAsync(System.Threadi using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); RolesReportGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new RolesReportGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new RolesReportGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/roles/report", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1442,7 +1432,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1454,7 +1444,7 @@ public partial class RolesReportGetApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1470,7 +1460,7 @@ public RolesReportGetApiResponse(ILogger logger, Syst /// /// /// - public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public RolesReportGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1521,7 +1511,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1536,7 +1526,7 @@ private void AfterTestDefaultImplementation(ITestApiResponse apiResponseLocalVar bool suppressDefaultLog = false; AfterTest(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1557,7 +1547,7 @@ private void OnErrorTestDefaultImplementation(Exception exceptionLocalVar, strin bool suppressDefaultLogLocalVar = false; OnErrorTest(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1623,13 +1613,12 @@ public async Task TestAsync(System.Threading.CancellationToken using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1659,7 +1648,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1671,7 +1660,7 @@ public partial class TestApiResponse : Org.OpenAPITools.Client.ApiResponse, ITes /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1687,7 +1676,7 @@ public TestApiResponse(ILogger logger, System.Net.Http.HttpRequ /// /// /// - public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1738,7 +1727,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs index 7f78296b1c0b..634953c2057b 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Api @@ -1224,11 +1225,6 @@ public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -1273,7 +1269,7 @@ public sealed partial class FakeApi : IFakeApi /// Initializes a new instance of the class. /// /// - public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, + public FakeApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeApiEvents fakeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -1281,8 +1277,7 @@ public FakeApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -1301,7 +1296,7 @@ private void AfterFakeHealthGetDefaultImplementation(IFakeHealthGetApiResponse a bool suppressDefaultLog = false; AfterFakeHealthGet(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1322,7 +1317,7 @@ private void OnErrorFakeHealthGetDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorFakeHealthGet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1388,13 +1383,12 @@ public async Task FakeHealthGetAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeHealthGetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeHealthGetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeHealthGetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/health", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1424,7 +1418,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1436,7 +1430,7 @@ public partial class FakeHealthGetApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1452,7 +1446,7 @@ public FakeHealthGetApiResponse(ILogger logger, System /// /// /// - public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeHealthGetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1503,7 +1497,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1521,7 +1515,7 @@ private void AfterFakeOuterBooleanSerializeDefaultImplementation(IFakeOuterBoole bool suppressDefaultLog = false; AfterFakeOuterBooleanSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1544,7 +1538,7 @@ private void OnErrorFakeOuterBooleanSerializeDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterBooleanSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1631,13 +1625,12 @@ public async Task FakeOuterBooleanSeriali using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterBooleanSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterBooleanSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterBooleanSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/boolean", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1667,7 +1660,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1679,7 +1672,7 @@ public partial class FakeOuterBooleanSerializeApiResponse : Org.OpenAPITools.Cli /// /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1695,7 +1688,7 @@ public FakeOuterBooleanSerializeApiResponse(ILogger /// /// - public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterBooleanSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1746,7 +1739,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1775,7 +1768,7 @@ private void AfterFakeOuterCompositeSerializeDefaultImplementation(IFakeOuterCom bool suppressDefaultLog = false; AfterFakeOuterCompositeSerialize(ref suppressDefaultLog, apiResponseLocalVar, outerComposite); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1798,7 +1791,7 @@ private void OnErrorFakeOuterCompositeSerializeDefaultImplementation(Exception e bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterCompositeSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, outerComposite); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1887,13 +1880,12 @@ public async Task FakeOuterCompositeSer using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterCompositeSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterCompositeSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterCompositeSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/composite", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1923,7 +1915,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1935,7 +1927,7 @@ public partial class FakeOuterCompositeSerializeApiResponse : Org.OpenAPITools.C /// /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1951,7 +1943,7 @@ public FakeOuterCompositeSerializeApiResponse(ILogger /// /// - public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterCompositeSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2002,7 +1994,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2020,7 +2012,7 @@ private void AfterFakeOuterNumberSerializeDefaultImplementation(IFakeOuterNumber bool suppressDefaultLog = false; AfterFakeOuterNumberSerialize(ref suppressDefaultLog, apiResponseLocalVar, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2043,7 +2035,7 @@ private void OnErrorFakeOuterNumberSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterNumberSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2130,13 +2122,12 @@ public async Task FakeOuterNumberSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterNumberSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterNumberSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterNumberSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/number", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2166,7 +2157,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2178,7 +2169,7 @@ public partial class FakeOuterNumberSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2194,7 +2185,7 @@ public FakeOuterNumberSerializeApiResponse(ILogger /// /// - public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterNumberSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2245,7 +2236,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2275,7 +2266,7 @@ private void AfterFakeOuterStringSerializeDefaultImplementation(IFakeOuterString bool suppressDefaultLog = false; AfterFakeOuterStringSerialize(ref suppressDefaultLog, apiResponseLocalVar, requiredStringUuid, body); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2300,7 +2291,7 @@ private void OnErrorFakeOuterStringSerializeDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorFakeOuterStringSerialize(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredStringUuid, body); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2398,13 +2389,12 @@ public async Task FakeOuterStringSerialize using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FakeOuterStringSerializeApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FakeOuterStringSerializeApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FakeOuterStringSerializeApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/outer/string", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2434,7 +2424,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2446,7 +2436,7 @@ public partial class FakeOuterStringSerializeApiResponse : Org.OpenAPITools.Clie /// /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2462,7 +2452,7 @@ public FakeOuterStringSerializeApiResponse(ILogger /// /// - public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FakeOuterStringSerializeApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2513,7 +2503,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2528,7 +2518,7 @@ private void AfterGetArrayOfEnumsDefaultImplementation(IGetArrayOfEnumsApiRespon bool suppressDefaultLog = false; AfterGetArrayOfEnums(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2549,7 +2539,7 @@ private void OnErrorGetArrayOfEnumsDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorGetArrayOfEnums(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2615,13 +2605,12 @@ public async Task GetArrayOfEnumsAsync(System.Threa using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetArrayOfEnumsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetArrayOfEnumsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetArrayOfEnumsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/array-of-enums", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2651,7 +2640,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2663,7 +2652,7 @@ public partial class GetArrayOfEnumsApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2679,7 +2668,7 @@ public GetArrayOfEnumsApiResponse(ILogger logger, Sy /// /// /// - public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetArrayOfEnumsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2730,7 +2719,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2745,7 +2734,7 @@ private void AfterGetMixedAnyOfDefaultImplementation(IGetMixedAnyOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedAnyOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2766,7 +2755,7 @@ private void OnErrorGetMixedAnyOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedAnyOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2832,13 +2821,12 @@ public async Task GetMixedAnyOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedAnyOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetMixedAnyOfApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetMixedAnyOfApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/anyOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2868,7 +2856,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2880,7 +2868,7 @@ public partial class GetMixedAnyOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2896,7 +2884,7 @@ public GetMixedAnyOfApiResponse(ILogger logger, System /// /// /// - public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedAnyOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2947,7 +2935,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2962,7 +2950,7 @@ private void AfterGetMixedOneOfDefaultImplementation(IGetMixedOneOfApiResponse a bool suppressDefaultLog = false; AfterGetMixedOneOf(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2983,7 +2971,7 @@ private void OnErrorGetMixedOneOfDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetMixedOneOf(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3049,13 +3037,12 @@ public async Task GetMixedOneOfAsync(System.Threading using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetMixedOneOfApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetMixedOneOfApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetMixedOneOfApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/mixed/oneOf", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3085,7 +3072,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3097,7 +3084,7 @@ public partial class GetMixedOneOfApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3113,7 +3100,7 @@ public GetMixedOneOfApiResponse(ILogger logger, System /// /// /// - public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetMixedOneOfApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3164,7 +3151,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3193,7 +3180,7 @@ private void AfterTestAdditionalPropertiesReferenceDefaultImplementation(ITestAd bool suppressDefaultLog = false; AfterTestAdditionalPropertiesReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3216,7 +3203,7 @@ private void OnErrorTestAdditionalPropertiesReferenceDefaultImplementation(Excep bool suppressDefaultLogLocalVar = false; OnErrorTestAdditionalPropertiesReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3294,13 +3281,12 @@ public async Task TestAdditionalP using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestAdditionalPropertiesReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestAdditionalPropertiesReferenceApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestAdditionalPropertiesReferenceApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/additionalProperties-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3330,7 +3316,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3342,7 +3328,7 @@ public partial class TestAdditionalPropertiesReferenceApiResponse : Org.OpenAPIT /// /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3358,7 +3344,7 @@ public TestAdditionalPropertiesReferenceApiResponse(ILogger /// /// - public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestAdditionalPropertiesReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3377,7 +3363,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3406,7 +3392,7 @@ private void AfterTestBodyWithFileSchemaDefaultImplementation(ITestBodyWithFileS bool suppressDefaultLog = false; AfterTestBodyWithFileSchema(ref suppressDefaultLog, apiResponseLocalVar, fileSchemaTestClass); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3429,7 +3415,7 @@ private void OnErrorTestBodyWithFileSchemaDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithFileSchema(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, fileSchemaTestClass); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3507,13 +3493,12 @@ public async Task TestBodyWithFileSchemaAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithFileSchemaApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestBodyWithFileSchemaApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestBodyWithFileSchemaApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-file-schema", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3543,7 +3528,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3555,7 +3540,7 @@ public partial class TestBodyWithFileSchemaApiResponse : Org.OpenAPITools.Client /// /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3571,7 +3556,7 @@ public TestBodyWithFileSchemaApiResponse(ILogger /// /// - public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithFileSchemaApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3590,7 +3575,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3624,7 +3609,7 @@ private void AfterTestBodyWithQueryParamsDefaultImplementation(ITestBodyWithQuer bool suppressDefaultLog = false; AfterTestBodyWithQueryParams(ref suppressDefaultLog, apiResponseLocalVar, query, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3649,7 +3634,7 @@ private void OnErrorTestBodyWithQueryParamsDefaultImplementation(Exception excep bool suppressDefaultLogLocalVar = false; OnErrorTestBodyWithQueryParams(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, query, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3736,13 +3721,12 @@ public async Task TestBodyWithQueryParamsAs using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestBodyWithQueryParamsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestBodyWithQueryParamsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/body-with-query-params", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3772,7 +3756,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3784,7 +3768,7 @@ public partial class TestBodyWithQueryParamsApiResponse : Org.OpenAPITools.Clien /// /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3800,7 +3784,7 @@ public TestBodyWithQueryParamsApiResponse(ILogger /// /// - public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestBodyWithQueryParamsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3819,7 +3803,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3848,7 +3832,7 @@ private void AfterTestClientModelDefaultImplementation(ITestClientModelApiRespon bool suppressDefaultLog = false; AfterTestClientModel(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3871,7 +3855,7 @@ private void OnErrorTestClientModelDefaultImplementation(Exception exceptionLoca bool suppressDefaultLogLocalVar = false; OnErrorTestClientModel(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3957,13 +3941,12 @@ public async Task TestClientModelAsync(ModelClient using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClientModelApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestClientModelApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestClientModelApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3993,7 +3976,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4005,7 +3988,7 @@ public partial class TestClientModelApiResponse : Org.OpenAPITools.Client.ApiRes /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4021,7 +4004,7 @@ public TestClientModelApiResponse(ILogger logger, Sy /// /// /// - public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClientModelApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4072,7 +4055,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4134,7 +4117,7 @@ private void AfterTestEndpointParametersDefaultImplementation(ITestEndpointParam bool suppressDefaultLog = false; AfterTestEndpointParameters(ref suppressDefaultLog, apiResponseLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4183,7 +4166,7 @@ private void OnErrorTestEndpointParametersDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestEndpointParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, number, patternWithoutDelimiter, varByte, varDouble, binary, callback, date, dateTime, int32, int64, integer, password, varFloat, varString); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4341,13 +4324,12 @@ public async Task TestEndpointParametersAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEndpointParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestEndpointParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestEndpointParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4381,7 +4363,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4393,7 +4375,7 @@ public partial class TestEndpointParametersApiResponse : Org.OpenAPITools.Client /// /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4409,7 +4391,7 @@ public TestEndpointParametersApiResponse(ILogger /// /// - public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEndpointParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4434,7 +4416,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4490,7 +4472,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4527,7 +4509,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4670,13 +4652,12 @@ public async Task TestEnumParametersAsync(Option using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestEnumParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestEnumParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestEnumParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4706,7 +4687,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4718,7 +4699,7 @@ public partial class TestEnumParametersApiResponse : Org.OpenAPITools.Client.Api /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4734,7 +4715,7 @@ public TestEnumParametersApiResponse(ILogger logg /// /// /// - public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestEnumParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -4759,7 +4740,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -4782,7 +4763,7 @@ private void AfterTestGroupParametersDefaultImplementation(ITestGroupParametersA bool suppressDefaultLog = false; AfterTestGroupParameters(ref suppressDefaultLog, apiResponseLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -4815,7 +4796,7 @@ private void OnErrorTestGroupParametersDefaultImplementation(Exception exception bool suppressDefaultLogLocalVar = false; OnErrorTestGroupParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requiredBooleanGroup, requiredInt64Group, requiredStringGroup, booleanGroup, int64Group, stringGroup); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -4935,13 +4916,12 @@ public async Task TestGroupParametersAsync(bool using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestGroupParametersApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestGroupParametersApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestGroupParametersApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -4975,7 +4955,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -4987,7 +4967,7 @@ public partial class TestGroupParametersApiResponse : Org.OpenAPITools.Client.Ap /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5003,7 +4983,7 @@ public TestGroupParametersApiResponse(ILogger lo /// /// /// - public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestGroupParametersApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5022,7 +5002,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5051,7 +5031,7 @@ private void AfterTestInlineAdditionalPropertiesDefaultImplementation(ITestInlin bool suppressDefaultLog = false; AfterTestInlineAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5074,7 +5054,7 @@ private void OnErrorTestInlineAdditionalPropertiesDefaultImplementation(Exceptio bool suppressDefaultLogLocalVar = false; OnErrorTestInlineAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5152,13 +5132,12 @@ public async Task TestInlineAddition using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestInlineAdditionalPropertiesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestInlineAdditionalPropertiesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5188,7 +5167,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5200,7 +5179,7 @@ public partial class TestInlineAdditionalPropertiesApiResponse : Org.OpenAPITool /// /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5216,7 +5195,7 @@ public TestInlineAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5235,7 +5214,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5264,7 +5243,7 @@ private void AfterTestInlineFreeformAdditionalPropertiesDefaultImplementation(IT bool suppressDefaultLog = false; AfterTestInlineFreeformAdditionalProperties(ref suppressDefaultLog, apiResponseLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5287,7 +5266,7 @@ private void OnErrorTestInlineFreeformAdditionalPropertiesDefaultImplementation( bool suppressDefaultLogLocalVar = false; OnErrorTestInlineFreeformAdditionalProperties(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, testInlineFreeformAdditionalPropertiesRequest); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5365,13 +5344,12 @@ public async Task TestInline using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestInlineFreeformAdditionalPropertiesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestInlineFreeformAdditionalPropertiesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestInlineFreeformAdditionalPropertiesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/inline-freeform-additionalProperties", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5401,7 +5379,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5413,7 +5391,7 @@ public partial class TestInlineFreeformAdditionalPropertiesApiResponse : Org.Ope /// /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5429,7 +5407,7 @@ public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger /// /// - public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestInlineFreeformAdditionalPropertiesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5448,7 +5426,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5482,7 +5460,7 @@ private void AfterTestJsonFormDataDefaultImplementation(ITestJsonFormDataApiResp bool suppressDefaultLog = false; AfterTestJsonFormData(ref suppressDefaultLog, apiResponseLocalVar, param, param2); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5507,7 +5485,7 @@ private void OnErrorTestJsonFormDataDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorTestJsonFormData(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, param, param2); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5588,13 +5566,12 @@ public async Task TestJsonFormDataAsync(string par using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestJsonFormDataApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestJsonFormDataApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestJsonFormDataApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/jsonFormData", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5624,7 +5601,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5636,7 +5613,7 @@ public partial class TestJsonFormDataApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5652,7 +5629,7 @@ public TestJsonFormDataApiResponse(ILogger logger, /// /// /// - public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestJsonFormDataApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5671,7 +5648,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5732,7 +5709,7 @@ private void AfterTestQueryParameterCollectionFormatDefaultImplementation(ITestQ bool suppressDefaultLog = false; AfterTestQueryParameterCollectionFormat(ref suppressDefaultLog, apiResponseLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -5771,7 +5748,7 @@ private void OnErrorTestQueryParameterCollectionFormatDefaultImplementation(Exce bool suppressDefaultLogLocalVar = false; OnErrorTestQueryParameterCollectionFormat(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, context, http, ioutil, pipe, requiredNotNullable, url, notRequiredNotNullable, notRequiredNullable, requiredNullable); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -5877,13 +5854,12 @@ public async Task TestQueryParam using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestQueryParameterCollectionFormatApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestQueryParameterCollectionFormatApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestQueryParameterCollectionFormatApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/test-query-parameters", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -5913,7 +5889,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -5925,7 +5901,7 @@ public partial class TestQueryParameterCollectionFormatApiResponse : Org.OpenAPI /// /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5941,7 +5917,7 @@ public TestQueryParameterCollectionFormatApiResponse(ILogger /// /// - public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestQueryParameterCollectionFormatApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -5960,7 +5936,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -5989,7 +5965,7 @@ private void AfterTestStringMapReferenceDefaultImplementation(ITestStringMapRefe bool suppressDefaultLog = false; AfterTestStringMapReference(ref suppressDefaultLog, apiResponseLocalVar, requestBody); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -6012,7 +5988,7 @@ private void OnErrorTestStringMapReferenceDefaultImplementation(Exception except bool suppressDefaultLogLocalVar = false; OnErrorTestStringMapReference(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, requestBody); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -6090,13 +6066,12 @@ public async Task TestStringMapReferenceAsyn using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestStringMapReferenceApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestStringMapReferenceApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestStringMapReferenceApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/stringMap-reference", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -6126,7 +6101,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -6138,7 +6113,7 @@ public partial class TestStringMapReferenceApiResponse : Org.OpenAPITools.Client /// /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6154,7 +6129,7 @@ public TestStringMapReferenceApiResponse(ILogger /// /// - public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestStringMapReferenceApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -6173,7 +6148,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index c84e52a5a500..7f5ee645d275 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Api @@ -103,11 +104,6 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -152,7 +148,7 @@ public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api /// Initializes a new instance of the class. /// /// - public FakeClassnameTags123Api(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, + public FakeClassnameTags123Api(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, FakeClassnameTags123ApiEvents fakeClassnameTags123ApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -160,8 +156,7 @@ public FakeClassnameTags123Api(ILogger logger, ILoggerF TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = fakeClassnameTags123ApiEvents; ApiKeyProvider = apiKeyProvider; @@ -194,7 +189,7 @@ private void AfterTestClassnameDefaultImplementation(ITestClassnameApiResponse a bool suppressDefaultLog = false; AfterTestClassname(ref suppressDefaultLog, apiResponseLocalVar, modelClient); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -217,7 +212,7 @@ private void OnErrorTestClassnameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorTestClassname(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, modelClient); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -312,13 +307,12 @@ public async Task TestClassnameAsync(ModelClient mode using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); TestClassnameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new TestClassnameApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new TestClassnameApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake_classname_test", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -352,7 +346,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -364,7 +358,7 @@ public partial class TestClassnameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -380,7 +374,7 @@ public TestClassnameApiResponse(ILogger logger, System /// /// /// - public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public TestClassnameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -431,7 +425,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs index 8fd9ec7fe213..186b3f815b10 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/PetApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Api @@ -664,11 +665,6 @@ public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -713,7 +709,7 @@ public sealed partial class PetApi : IPetApi /// Initializes a new instance of the class. /// /// - public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, + public PetApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, PetApiEvents petApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -721,8 +717,7 @@ public PetApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient h TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = petApiEvents; ApiKeyProvider = apiKeyProvider; @@ -755,7 +750,7 @@ private void AfterAddPetDefaultImplementation(IAddPetApiResponse apiResponseLoca bool suppressDefaultLog = false; AfterAddPet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -778,7 +773,7 @@ private void OnErrorAddPetDefaultImplementation(Exception exceptionLocalVar, str bool suppressDefaultLogLocalVar = false; OnErrorAddPet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -878,13 +873,12 @@ public async Task AddPetAsync(Pet pet, System.Threading.Canc using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); AddPetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new AddPetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new AddPetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -918,7 +912,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -930,7 +924,7 @@ public partial class AddPetApiResponse : Org.OpenAPITools.Client.ApiResponse, IA /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -946,7 +940,7 @@ public AddPetApiResponse(ILogger logger, System.Net.Http.Http /// /// /// - public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public AddPetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -965,7 +959,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -995,7 +989,7 @@ private void AfterDeletePetDefaultImplementation(IDeletePetApiResponse apiRespon bool suppressDefaultLog = false; AfterDeletePet(ref suppressDefaultLog, apiResponseLocalVar, petId, apiKey); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1020,7 +1014,7 @@ private void OnErrorDeletePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeletePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, apiKey); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1108,13 +1102,12 @@ public async Task DeletePetAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeletePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeletePetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeletePetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1148,7 +1141,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1160,7 +1153,7 @@ public partial class DeletePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1176,7 +1169,7 @@ public DeletePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeletePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1195,7 +1188,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1224,7 +1217,7 @@ private void AfterFindPetsByStatusDefaultImplementation(IFindPetsByStatusApiResp bool suppressDefaultLog = false; AfterFindPetsByStatus(ref suppressDefaultLog, apiResponseLocalVar, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1247,7 +1240,7 @@ private void OnErrorFindPetsByStatusDefaultImplementation(Exception exceptionLoc bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByStatus(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1344,13 +1337,12 @@ public async Task FindPetsByStatusAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByStatusApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FindPetsByStatusApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FindPetsByStatusApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByStatus", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1384,7 +1376,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1396,7 +1388,7 @@ public partial class FindPetsByStatusApiResponse : Org.OpenAPITools.Client.ApiRe /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1412,7 +1404,7 @@ public FindPetsByStatusApiResponse(ILogger logger, /// /// /// - public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByStatusApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1495,7 +1487,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1524,7 +1516,7 @@ private void AfterFindPetsByTagsDefaultImplementation(IFindPetsByTagsApiResponse bool suppressDefaultLog = false; AfterFindPetsByTags(ref suppressDefaultLog, apiResponseLocalVar, tags); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1547,7 +1539,7 @@ private void OnErrorFindPetsByTagsDefaultImplementation(Exception exceptionLocal bool suppressDefaultLogLocalVar = false; OnErrorFindPetsByTags(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, tags); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1644,13 +1636,12 @@ public async Task FindPetsByTagsAsync(List t using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); FindPetsByTagsApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new FindPetsByTagsApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new FindPetsByTagsApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/findByTags", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1684,7 +1675,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1696,7 +1687,7 @@ public partial class FindPetsByTagsApiResponse : Org.OpenAPITools.Client.ApiResp /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1712,7 +1703,7 @@ public FindPetsByTagsApiResponse(ILogger logger, Syst /// /// /// - public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public FindPetsByTagsApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1769,7 +1760,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1787,7 +1778,7 @@ private void AfterGetPetByIdDefaultImplementation(IGetPetByIdApiResponse apiResp bool suppressDefaultLog = false; AfterGetPetById(ref suppressDefaultLog, apiResponseLocalVar, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1810,7 +1801,7 @@ private void OnErrorGetPetByIdDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorGetPetById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1896,13 +1887,12 @@ public async Task GetPetByIdAsync(long petId, System.Thr using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetPetByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetPetByIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetPetByIdApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1936,7 +1926,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1948,7 +1938,7 @@ public partial class GetPetByIdApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1964,7 +1954,7 @@ public GetPetByIdApiResponse(ILogger logger, System.Net.H /// /// /// - public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetPetByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2027,7 +2017,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2056,7 +2046,7 @@ private void AfterUpdatePetDefaultImplementation(IUpdatePetApiResponse apiRespon bool suppressDefaultLog = false; AfterUpdatePet(ref suppressDefaultLog, apiResponseLocalVar, pet); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2079,7 +2069,7 @@ private void OnErrorUpdatePetDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdatePet(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, pet); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2173,13 +2163,12 @@ public async Task UpdatePetAsync(Pet pet, System.Threadin using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdatePetApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdatePetApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2213,7 +2202,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2225,7 +2214,7 @@ public partial class UpdatePetApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2241,7 +2230,7 @@ public UpdatePetApiResponse(ILogger logger, System.Net.Htt /// /// /// - public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2272,7 +2261,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2307,7 +2296,7 @@ private void AfterUpdatePetWithFormDefaultImplementation(IUpdatePetWithFormApiRe bool suppressDefaultLog = false; AfterUpdatePetWithForm(ref suppressDefaultLog, apiResponseLocalVar, petId, name, status); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2334,7 +2323,7 @@ private void OnErrorUpdatePetWithFormDefaultImplementation(Exception exceptionLo bool suppressDefaultLogLocalVar = false; OnErrorUpdatePetWithForm(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, name, status); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2428,13 +2417,12 @@ public async Task UpdatePetWithFormAsync(long pet using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdatePetWithFormApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdatePetWithFormApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdatePetWithFormApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2468,7 +2456,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2480,7 +2468,7 @@ public partial class UpdatePetWithFormApiResponse : Org.OpenAPITools.Client.ApiR /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2496,7 +2484,7 @@ public UpdatePetWithFormApiResponse(ILogger logger /// /// /// - public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdatePetWithFormApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2515,7 +2503,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2550,7 +2538,7 @@ private void AfterUploadFileDefaultImplementation(IUploadFileApiResponse apiResp bool suppressDefaultLog = false; AfterUploadFile(ref suppressDefaultLog, apiResponseLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2577,7 +2565,7 @@ private void OnErrorUploadFileDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUploadFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, additionalMetadata, file); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2687,13 +2675,12 @@ public async Task UploadFileAsync(long petId, Option apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFileApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImage", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2727,7 +2714,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2739,7 +2726,7 @@ public partial class UploadFileApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2755,7 +2742,7 @@ public UploadFileApiResponse(ILogger logger, System.Net.H /// /// /// - public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2806,7 +2793,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2841,7 +2828,7 @@ private void AfterUploadFileWithRequiredFileDefaultImplementation(IUploadFileWit bool suppressDefaultLog = false; AfterUploadFileWithRequiredFile(ref suppressDefaultLog, apiResponseLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2868,7 +2855,7 @@ private void OnErrorUploadFileWithRequiredFileDefaultImplementation(Exception ex bool suppressDefaultLogLocalVar = false; OnErrorUploadFileWithRequiredFile(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, petId, requiredFile, additionalMetadata); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2978,13 +2965,12 @@ public async Task UploadFileWithRequired using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFileWithRequiredFileApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFileWithRequiredFileApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/fake/{petId}/uploadImageWithRequiredFile", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3018,7 +3004,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3030,7 +3016,7 @@ public partial class UploadFileWithRequiredFileApiResponse : Org.OpenAPITools.Cl /// /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3046,7 +3032,7 @@ public UploadFileWithRequiredFileApiResponse(ILogger /// /// - public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFileWithRequiredFileApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3097,7 +3083,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -3127,7 +3113,7 @@ private void AfterUploadFilesDefaultImplementation(IUploadFilesApiResponse apiRe bool suppressDefaultLog = false; AfterUploadFiles(ref suppressDefaultLog, apiResponseLocalVar, files, petId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -3152,7 +3138,7 @@ private void OnErrorUploadFilesDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorUploadFiles(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, files, petId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -3256,13 +3242,12 @@ public async Task UploadFilesAsync(List apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UploadFilesApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UploadFilesApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UploadFilesApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/pet/{petId}/uploadImages", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -3296,7 +3281,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -3308,7 +3293,7 @@ public partial class UploadFilesApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3324,7 +3309,7 @@ public UploadFilesApiResponse(ILogger logger, System.Net /// /// /// - public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UploadFilesApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -3375,7 +3360,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs index f8551cfa6d00..e57361a572ac 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/StoreApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Api @@ -290,11 +291,6 @@ public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -339,7 +335,7 @@ public sealed partial class StoreApi : IStoreApi /// Initializes a new instance of the class. /// /// - public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, + public StoreApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, StoreApiEvents storeApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -347,8 +343,7 @@ public StoreApi(ILogger logger, ILoggerFactory loggerFactory, HttpClie TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = storeApiEvents; ApiKeyProvider = apiKeyProvider; @@ -381,7 +376,7 @@ private void AfterDeleteOrderDefaultImplementation(IDeleteOrderApiResponse apiRe bool suppressDefaultLog = false; AfterDeleteOrder(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -404,7 +399,7 @@ private void OnErrorDeleteOrderDefaultImplementation(Exception exceptionLocalVar bool suppressDefaultLogLocalVar = false; OnErrorDeleteOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -469,13 +464,12 @@ public async Task DeleteOrderAsync(string orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeleteOrderApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeleteOrderApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -505,7 +499,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -517,7 +511,7 @@ public partial class DeleteOrderApiResponse : Org.OpenAPITools.Client.ApiRespons /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -533,7 +527,7 @@ public DeleteOrderApiResponse(ILogger logger, System.Net /// /// /// - public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -558,7 +552,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -573,7 +567,7 @@ private void AfterGetInventoryDefaultImplementation(IGetInventoryApiResponse api bool suppressDefaultLog = false; AfterGetInventory(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -594,7 +588,7 @@ private void OnErrorGetInventoryDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetInventory(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -665,13 +659,12 @@ public async Task GetInventoryAsync(System.Threading.C using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetInventoryApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetInventoryApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetInventoryApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/inventory", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -705,7 +698,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -717,7 +710,7 @@ public partial class GetInventoryApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -733,7 +726,7 @@ public GetInventoryApiResponse(ILogger logger, System.N /// /// /// - public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetInventoryApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -784,7 +777,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -802,7 +795,7 @@ private void AfterGetOrderByIdDefaultImplementation(IGetOrderByIdApiResponse api bool suppressDefaultLog = false; AfterGetOrderById(ref suppressDefaultLog, apiResponseLocalVar, orderId); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -825,7 +818,7 @@ private void OnErrorGetOrderByIdDefaultImplementation(Exception exceptionLocalVa bool suppressDefaultLogLocalVar = false; OnErrorGetOrderById(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, orderId); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -898,13 +891,12 @@ public async Task GetOrderByIdAsync(long orderId, Syst using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetOrderByIdApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetOrderByIdApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetOrderByIdApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order/{order_id}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -934,7 +926,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -946,7 +938,7 @@ public partial class GetOrderByIdApiResponse : Org.OpenAPITools.Client.ApiRespon /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -962,7 +954,7 @@ public GetOrderByIdApiResponse(ILogger logger, System.N /// /// /// - public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetOrderByIdApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1025,7 +1017,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1054,7 +1046,7 @@ private void AfterPlaceOrderDefaultImplementation(IPlaceOrderApiResponse apiResp bool suppressDefaultLog = false; AfterPlaceOrder(ref suppressDefaultLog, apiResponseLocalVar, order); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1077,7 +1069,7 @@ private void OnErrorPlaceOrderDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorPlaceOrder(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, order); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1164,13 +1156,12 @@ public async Task PlaceOrderAsync(Order order, System.Th using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); PlaceOrderApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new PlaceOrderApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new PlaceOrderApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/store/order", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1200,7 +1191,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1212,7 +1203,7 @@ public partial class PlaceOrderApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1228,7 +1219,7 @@ public PlaceOrderApiResponse(ILogger logger, System.Net.H /// /// /// - public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public PlaceOrderApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1285,7 +1276,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs index 6f79c82446ac..65a7cfac2b88 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Api/UserApi.cs @@ -19,6 +19,7 @@ using System.Net.Http.Headers; using System.Text.Json; using Org.OpenAPITools.Client; +using Org.OpenAPITools.Logging; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Api @@ -532,11 +533,6 @@ public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; - /// - /// The logger factory - /// - public ILoggerFactory LoggerFactory { get; } - /// /// The logger /// @@ -581,7 +577,7 @@ public sealed partial class UserApi : IUserApi /// Initializes a new instance of the class. /// /// - public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, + public UserApi(ILogger logger, HttpClient httpClient, JsonSerializerOptionsProvider jsonSerializerOptionsProvider, UserApiEvents userApiEvents, TokenProvider apiKeyProvider, TokenProvider bearerTokenProvider, TokenProvider basicTokenProvider, @@ -589,8 +585,7 @@ public UserApi(ILogger logger, ILoggerFactory loggerFactory, HttpClient TokenProvider oauthTokenProvider) { _jsonSerializerOptions = jsonSerializerOptionsProvider.Options; - LoggerFactory = loggerFactory; - Logger = LoggerFactory.CreateLogger(); + Logger = logger; HttpClient = httpClient; Events = userApiEvents; ApiKeyProvider = apiKeyProvider; @@ -623,7 +618,7 @@ private void AfterCreateUserDefaultImplementation(ICreateUserApiResponse apiResp bool suppressDefaultLog = false; AfterCreateUser(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -646,7 +641,7 @@ private void OnErrorCreateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorCreateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -724,13 +719,12 @@ public async Task CreateUserAsync(User user, System.Thre using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -760,7 +754,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -772,7 +766,7 @@ public partial class CreateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -788,7 +782,7 @@ public CreateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -807,7 +801,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -836,7 +830,7 @@ private void AfterCreateUsersWithArrayInputDefaultImplementation(ICreateUsersWit bool suppressDefaultLog = false; AfterCreateUsersWithArrayInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -859,7 +853,7 @@ private void OnErrorCreateUsersWithArrayInputDefaultImplementation(Exception exc bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithArrayInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -937,13 +931,12 @@ public async Task CreateUsersWithArrayInp using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithArrayInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUsersWithArrayInputApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUsersWithArrayInputApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithArray", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -973,7 +966,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -985,7 +978,7 @@ public partial class CreateUsersWithArrayInputApiResponse : Org.OpenAPITools.Cli /// /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1001,7 +994,7 @@ public CreateUsersWithArrayInputApiResponse(ILogger /// /// - public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithArrayInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1020,7 +1013,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1049,7 +1042,7 @@ private void AfterCreateUsersWithListInputDefaultImplementation(ICreateUsersWith bool suppressDefaultLog = false; AfterCreateUsersWithListInput(ref suppressDefaultLog, apiResponseLocalVar, user); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1072,7 +1065,7 @@ private void OnErrorCreateUsersWithListInputDefaultImplementation(Exception exce bool suppressDefaultLogLocalVar = false; OnErrorCreateUsersWithListInput(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1150,13 +1143,12 @@ public async Task CreateUsersWithListInput using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); CreateUsersWithListInputApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new CreateUsersWithListInputApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new CreateUsersWithListInputApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/createWithList", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1186,7 +1178,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1198,7 +1190,7 @@ public partial class CreateUsersWithListInputApiResponse : Org.OpenAPITools.Clie /// /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1214,7 +1206,7 @@ public CreateUsersWithListInputApiResponse(ILogger /// /// - public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public CreateUsersWithListInputApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1233,7 +1225,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1262,7 +1254,7 @@ private void AfterDeleteUserDefaultImplementation(IDeleteUserApiResponse apiResp bool suppressDefaultLog = false; AfterDeleteUser(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1285,7 +1277,7 @@ private void OnErrorDeleteUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorDeleteUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1350,13 +1342,12 @@ public async Task DeleteUserAsync(string username, Syste using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); DeleteUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new DeleteUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new DeleteUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1386,7 +1377,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1398,7 +1389,7 @@ public partial class DeleteUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1414,7 +1405,7 @@ public DeleteUserApiResponse(ILogger logger, System.Net.H /// /// /// - public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public DeleteUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1439,7 +1430,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1468,7 +1459,7 @@ private void AfterGetUserByNameDefaultImplementation(IGetUserByNameApiResponse a bool suppressDefaultLog = false; AfterGetUserByName(ref suppressDefaultLog, apiResponseLocalVar, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1491,7 +1482,7 @@ private void OnErrorGetUserByNameDefaultImplementation(Exception exceptionLocalV bool suppressDefaultLogLocalVar = false; OnErrorGetUserByName(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1566,13 +1557,12 @@ public async Task GetUserByNameAsync(string username, using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); GetUserByNameApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new GetUserByNameApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new GetUserByNameApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1602,7 +1592,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1614,7 +1604,7 @@ public partial class GetUserByNameApiResponse : Org.OpenAPITools.Client.ApiRespo /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1630,7 +1620,7 @@ public GetUserByNameApiResponse(ILogger logger, System /// /// /// - public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public GetUserByNameApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1737,7 +1727,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -1771,7 +1761,7 @@ private void AfterLoginUserDefaultImplementation(ILoginUserApiResponse apiRespon bool suppressDefaultLog = false; AfterLoginUser(ref suppressDefaultLog, apiResponseLocalVar, password, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -1796,7 +1786,7 @@ private void OnErrorLoginUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLoginUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, password, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -1880,13 +1870,12 @@ public async Task LoginUserAsync(string password, string using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LoginUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new LoginUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new LoginUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/login", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -1916,7 +1905,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -1928,7 +1917,7 @@ public partial class LoginUserApiResponse : Org.OpenAPITools.Client.ApiResponse, /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -1944,7 +1933,7 @@ public LoginUserApiResponse(ILogger logger, System.Net.Htt /// /// /// - public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LoginUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2001,7 +1990,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2016,7 +2005,7 @@ private void AfterLogoutUserDefaultImplementation(ILogoutUserApiResponse apiResp bool suppressDefaultLog = false; AfterLogoutUser(ref suppressDefaultLog, apiResponseLocalVar); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2037,7 +2026,7 @@ private void OnErrorLogoutUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorLogoutUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2094,13 +2083,12 @@ public async Task LogoutUserAsync(System.Threading.Cance using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); LogoutUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new LogoutUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new LogoutUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/logout", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2130,7 +2118,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2142,7 +2130,7 @@ public partial class LogoutUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2158,7 +2146,7 @@ public LogoutUserApiResponse(ILogger logger, System.Net.H /// /// /// - public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public LogoutUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2177,7 +2165,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); @@ -2211,7 +2199,7 @@ private void AfterUpdateUserDefaultImplementation(IUpdateUserApiResponse apiResp bool suppressDefaultLog = false; AfterUpdateUser(ref suppressDefaultLog, apiResponseLocalVar, user, username); if (!suppressDefaultLog) - Logger.LogInformation("{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); + Logger.LogInformation(RestLogEvents.ApiRequestCompleted, "{0,-9} | {1} | {2}", (apiResponseLocalVar.DownloadedAt - apiResponseLocalVar.RequestedAt).TotalSeconds, apiResponseLocalVar.StatusCode, apiResponseLocalVar.Path); } /// @@ -2236,7 +2224,7 @@ private void OnErrorUpdateUserDefaultImplementation(Exception exceptionLocalVar, bool suppressDefaultLogLocalVar = false; OnErrorUpdateUser(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, user, username); if (!suppressDefaultLogLocalVar) - Logger.LogError(exceptionLocalVar, "An error occurred while sending the request to the server."); + Logger.LogError(RestLogEvents.ApiRequestFailed, exceptionLocalVar, "An error occurred while sending the request to the server."); } /// @@ -2318,13 +2306,12 @@ public async Task UpdateUserAsync(User user, string user using (HttpResponseMessage httpResponseMessageLocalVar = await HttpClient.SendAsync(httpRequestMessageLocalVar, cancellationToken).ConfigureAwait(false)) { - ILogger apiResponseLoggerLocalVar = LoggerFactory.CreateLogger(); UpdateUserApiResponse apiResponseLocalVar; switch ((int)httpResponseMessageLocalVar.StatusCode) { default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync().ConfigureAwait(false); - apiResponseLocalVar = new UpdateUserApiResponse(apiResponseLoggerLocalVar, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new UpdateUserApiResponse(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "/user/{username}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -2354,7 +2341,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// The logger /// - public ILogger Logger { get; } + public ILogger Logger { get; } /// /// The @@ -2366,7 +2353,7 @@ public partial class UpdateUserApiResponse : Org.OpenAPITools.Client.ApiResponse /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, string rawContent, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, rawContent, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2382,7 +2369,7 @@ public UpdateUserApiResponse(ILogger logger, System.Net.H /// /// /// - public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) + public UpdateUserApiResponse(ILogger logger, System.Net.Http.HttpRequestMessage httpRequestMessage, System.Net.Http.HttpResponseMessage httpResponseMessage, System.IO.Stream contentStream, string path, DateTime requestedAt, System.Text.Json.JsonSerializerOptions jsonSerializerOptions) : base(httpRequestMessage, httpResponseMessage, contentStream, path, requestedAt, jsonSerializerOptions) { Logger = logger; OnCreated(httpRequestMessage, httpResponseMessage); @@ -2407,7 +2394,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht bool suppressDefaultLog = false; OnDeserializationError(ref suppressDefaultLog, exception, httpStatusCode); if (!suppressDefaultLog) - Logger.LogError(exception, "An error occurred while deserializing the {code} response.", httpStatusCode); + Logger.LogError(RestLogEvents.ApiDeserializationFailed, exception, "An error occurred while deserializing the {code} response.", httpStatusCode); } partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs new file mode 100644 index 000000000000..62b3298412d8 --- /dev/null +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Logging/RestLogEvents.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace Org.OpenAPITools.Logging +{ + internal static partial class RestLogEvents + { + // 3000-3099: REST API transport and response processing + internal static readonly EventId ApiRequestCompleted = new EventId(3000, nameof(ApiRequestCompleted)); + internal static readonly EventId ApiRequestFailed = new EventId(3001, nameof(ApiRequestFailed)); + internal static readonly EventId ApiDeserializationFailed = new EventId(3002, nameof(ApiDeserializationFailed)); + internal static readonly EventId ApiForbiddenWarning = new EventId(3003, nameof(ApiForbiddenWarning)); + } +} From b3e838673297c3cfa3f860a54ae76defecaa1356 Mon Sep 17 00:00:00 2001 From: devhl Date: Sun, 12 Jul 2026 12:54:46 -0400 Subject: [PATCH 4/4] minor fix for older frameworks --- .../main/resources/csharp/libraries/generichost/api.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache index 101466f247ad..3088a17bce8d 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache @@ -730,7 +730,7 @@ namespace {{packageName}}.{{apiPackage}} { byte[] responseBytesArrayLocalVar = await httpResponseMessageLocalVar.Content.ReadAsByteArrayAsync({{#net60OrLater}}cancellationToken{{/net60OrLater}}).ConfigureAwait(false); System.IO.Stream responseContentStreamLocalVar = new System.IO.MemoryStream(responseBytesArrayLocalVar); - apiResponseLocalVar = new{{^net60OrLater}} {{operationId}}ApiResponse{{/net60OrLater}}(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentStreamLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new{{^net60OrLater}} {{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse{{/net60OrLater}}(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentStreamLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); break; } @@ -739,7 +739,7 @@ namespace {{packageName}}.{{apiPackage}} {{/responses}} default: { string responseContentLocalVar = await httpResponseMessageLocalVar.Content.ReadAsStringAsync({{#net60OrLater}}cancellationToken{{/net60OrLater}}).ConfigureAwait(false); - apiResponseLocalVar = new{{^net60OrLater}} {{operationId}}ApiResponse{{/net60OrLater}}(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); + apiResponseLocalVar = new{{^net60OrLater}} {{#vendorExtensions.x-duplicates}}{{classname}}{{/vendorExtensions.x-duplicates}}{{operationId}}ApiResponse{{/net60OrLater}}(Logger, httpRequestMessageLocalVar, httpResponseMessageLocalVar, responseContentLocalVar, "{{{path}}}", requestedAtLocalVar, _jsonSerializerOptions); break; }