From 45fd66f30480a59927afb09e68ce0a63054e3384 Mon Sep 17 00:00:00 2001 From: James Russo <jr@halo3.net> Date: Thu, 8 Aug 2019 16:50:31 -0400 Subject: [PATCH 1/4] move UserAgent up to the constructor --- .../src/main/resources/csharp/ApiClient.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache index 6e2a4aa2583..931843e5441 100644 --- a/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache @@ -58,6 +58,7 @@ namespace {{packageName}}.Client {{#netStandard}} RestClient.IgnoreResponseStatusCode = true; {{/netStandard}} + RestClient.UserAgent = Configuration.UserAgent; } /// <summary> @@ -203,7 +204,6 @@ namespace {{packageName}}.Client {{#netStandard}}RestClient.Timeout = TimeSpan.FromMilliseconds(Configuration.Timeout);{{/netStandard}} {{^netStandard}}RestClient.Timeout = Configuration.Timeout;{{/netStandard}} // set user agent - RestClient.UserAgent = Configuration.UserAgent; InterceptRequest(request); {{#netStandard}} -- GitLab From 7e4a6bdcd02c6b87a6d7c78939fc52bfb6315490 Mon Sep 17 00:00:00 2001 From: James Russo <jr@halo3.net> Date: Thu, 8 Aug 2019 16:53:02 -0400 Subject: [PATCH 2/4] userAgent on both constructors. --- .../src/main/resources/csharp/ApiClient.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache index 931843e5441..c55fc47de3a 100644 --- a/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache @@ -74,6 +74,7 @@ namespace {{packageName}}.Client {{#netStandard}} RestClient.IgnoreResponseStatusCode = true; {{/netStandard}} + RestClient.UserAgent = Configuration.UserAgent; } /// <summary> -- GitLab From 8746cd95390986636fbb43dccc3d20f84758547f Mon Sep 17 00:00:00 2001 From: James Russo <jr@halo3.net> Date: Wed, 21 Aug 2019 10:00:50 -0400 Subject: [PATCH 3/4] update location of UserAgent --- .../src/main/resources/csharp/ApiClient.mustache | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache index c55fc47de3a..fb141d68d00 100644 --- a/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache @@ -58,7 +58,6 @@ namespace {{packageName}}.Client {{#netStandard}} RestClient.IgnoreResponseStatusCode = true; {{/netStandard}} - RestClient.UserAgent = Configuration.UserAgent; } /// <summary> @@ -74,7 +73,6 @@ namespace {{packageName}}.Client {{#netStandard}} RestClient.IgnoreResponseStatusCode = true; {{/netStandard}} - RestClient.UserAgent = Configuration.UserAgent; } /// <summary> @@ -205,7 +203,7 @@ namespace {{packageName}}.Client {{#netStandard}}RestClient.Timeout = TimeSpan.FromMilliseconds(Configuration.Timeout);{{/netStandard}} {{^netStandard}}RestClient.Timeout = Configuration.Timeout;{{/netStandard}} // set user agent - + RestClient.UserAgent = Configuration.UserAgent; InterceptRequest(request); {{#netStandard}} var response = RestClient.Execute(request).Result; @@ -246,6 +244,7 @@ namespace {{packageName}}.Client var request = PrepareRequest( path, method, queryParams, postBody, headerParams, formParams, fileParams, pathParams, contentType); + RestClient.UserAgent = Configuration.UserAgent; InterceptRequest(request); var response = await RestClient.Execute{{^netStandard}}TaskAsync{{/netStandard}}(request); InterceptResponse(request, response); -- GitLab From d749242bc290df6b0d90981711fd695e1f7b9ee7 Mon Sep 17 00:00:00 2001 From: James Russo <jr@halo3.net> Date: Wed, 21 Aug 2019 10:13:31 -0400 Subject: [PATCH 4/4] re-ran the petstore generation --- .../src/main/resources/csharp/ApiClient.mustache | 1 + .../OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache index fb141d68d00..812ac789ae5 100644 --- a/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache @@ -204,6 +204,7 @@ namespace {{packageName}}.Client {{^netStandard}}RestClient.Timeout = Configuration.Timeout;{{/netStandard}} // set user agent RestClient.UserAgent = Configuration.UserAgent; + InterceptRequest(request); {{#netStandard}} var response = RestClient.Execute(request).Result; diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs index 216469e1c8b..973dc3ec597 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs @@ -202,6 +202,7 @@ namespace Org.OpenAPITools.Client var request = PrepareRequest( path, method, queryParams, postBody, headerParams, formParams, fileParams, pathParams, contentType); + RestClient.UserAgent = Configuration.UserAgent; InterceptRequest(request); var response = await RestClient.ExecuteTaskAsync(request); InterceptResponse(request, response); -- GitLab