From dad677f63d8863d5d475cdf0bc389d987a9094d3 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sun, 3 Sep 2023 04:19:23 -0400 Subject: [PATCH] [csharp][generichost] Remove unnecessary json options (#16483) * started source generator * copy the options * fixed visibility * added new sample * discarded changes to existing samples * discarded changes to existing samples * build new sample * changed package name due to file path length limit * reverted changes to manual tests * fixed all new manual tests * inject contexts into api * only one JsonConstructor * fixed spacing * revert samples for easier merge master * revert unnecessary change * fixed formatting * build samples * reverting unintended commit * fixing default value * reverting unintended commit * removed unnecessary json option --- .../csharp/libraries/generichost/ApiResponse`1.mustache | 8 +++++--- .../csharp/libraries/generichost/AsModel.mustache | 2 +- .../src/Org.OpenAPITools/Client/ApiResponse`1.cs | 8 ++++---- .../src/Org.OpenAPITools/Client/ApiResponse`1.cs | 8 ++++---- .../src/Org.OpenAPITools/Client/ApiResponse`1.cs | 8 ++++---- .../src/Org.OpenAPITools/Client/ApiResponse`1.cs | 8 ++++---- .../src/Org.OpenAPITools/Client/ApiResponse`1.cs | 8 ++++---- .../src/Org.OpenAPITools/Client/ApiResponse`1.cs | 8 ++++---- 8 files changed, 30 insertions(+), 28 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache index 20823fd8fc1..3a182e9f694 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiResponse`1.mustache @@ -140,19 +140,21 @@ namespace {{packageName}}.{{clientPackage}} /// /// Deserializes the server's response /// - public T{{nrt?}} AsModel(System.Text.Json.JsonSerializerOptions{{nrt?}} options = null) + public T{{nrt?}} AsModel() { + {{#lambda.trimTrailingWithNewLine}} {{>AsModel}} + {{/lambda.trimTrailingWithNewLine}} } /// /// Returns true when the model can be deserialized /// - public bool TryToModel({{^netStandard}}[NotNullWhen(true)] {{/netStandard}}out T{{nrt?}} model, System.Text.Json.JsonSerializerOptions{{nrt?}} options = null) + public bool TryToModel({{^netStandard}}[NotNullWhen(true)] {{/netStandard}}out T{{nrt?}} model) { try { - model = AsModel(options); + model = AsModel(); return model != null; } catch diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache index 294dd0fabc1..74601310d63 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/AsModel.mustache @@ -1,4 +1,4 @@ // This logic may be modified with the AsModel.mustache template return IsSuccessStatusCode - ? System.Text.Json.JsonSerializer.Deserialize(RawContent, options ?? _jsonSerializerOptions) + ? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions) : default(T); \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs index 078a1f82504..c5af0f6e35c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiResponse`1.cs @@ -146,22 +146,22 @@ namespace Org.OpenAPITools.Client /// /// Deserializes the server's response /// - public T? AsModel(System.Text.Json.JsonSerializerOptions? options = null) + public T? AsModel() { // This logic may be modified with the AsModel.mustache template return IsSuccessStatusCode - ? System.Text.Json.JsonSerializer.Deserialize(RawContent, options ?? _jsonSerializerOptions) + ? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions) : default(T); } /// /// Returns true when the model can be deserialized /// - public bool TryToModel([NotNullWhen(true)] out T? model, System.Text.Json.JsonSerializerOptions? options = null) + public bool TryToModel([NotNullWhen(true)] out T? model) { try { - model = AsModel(options); + model = AsModel(); return model != null; } catch diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs index e1bd4dd8821..00289f34557 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs @@ -144,22 +144,22 @@ namespace Org.OpenAPITools.Client /// /// Deserializes the server's response /// - public T AsModel(System.Text.Json.JsonSerializerOptions options = null) + public T AsModel() { // This logic may be modified with the AsModel.mustache template return IsSuccessStatusCode - ? System.Text.Json.JsonSerializer.Deserialize(RawContent, options ?? _jsonSerializerOptions) + ? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions) : default(T); } /// /// Returns true when the model can be deserialized /// - public bool TryToModel([NotNullWhen(true)] out T model, System.Text.Json.JsonSerializerOptions options = null) + public bool TryToModel([NotNullWhen(true)] out T model) { try { - model = AsModel(options); + model = AsModel(); return model != null; } catch diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs index 76804c63e4f..61edc84f21c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs @@ -146,22 +146,22 @@ namespace Org.OpenAPITools.Client /// /// Deserializes the server's response /// - public T? AsModel(System.Text.Json.JsonSerializerOptions? options = null) + public T? AsModel() { // This logic may be modified with the AsModel.mustache template return IsSuccessStatusCode - ? System.Text.Json.JsonSerializer.Deserialize(RawContent, options ?? _jsonSerializerOptions) + ? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions) : default(T); } /// /// Returns true when the model can be deserialized /// - public bool TryToModel([NotNullWhen(true)] out T? model, System.Text.Json.JsonSerializerOptions? options = null) + public bool TryToModel([NotNullWhen(true)] out T? model) { try { - model = AsModel(options); + model = AsModel(); return model != null; } catch diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs index bfc858f83a9..8a2f03913d5 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs @@ -146,22 +146,22 @@ namespace Org.OpenAPITools.Client /// /// Deserializes the server's response /// - public T? AsModel(System.Text.Json.JsonSerializerOptions? options = null) + public T? AsModel() { // This logic may be modified with the AsModel.mustache template return IsSuccessStatusCode - ? System.Text.Json.JsonSerializer.Deserialize(RawContent, options ?? _jsonSerializerOptions) + ? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions) : default(T); } /// /// Returns true when the model can be deserialized /// - public bool TryToModel([NotNullWhen(true)] out T? model, System.Text.Json.JsonSerializerOptions? options = null) + public bool TryToModel([NotNullWhen(true)] out T? model) { try { - model = AsModel(options); + model = AsModel(); return model != null; } catch diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs index bfc858f83a9..8a2f03913d5 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiResponse`1.cs @@ -146,22 +146,22 @@ namespace Org.OpenAPITools.Client /// /// Deserializes the server's response /// - public T? AsModel(System.Text.Json.JsonSerializerOptions? options = null) + public T? AsModel() { // This logic may be modified with the AsModel.mustache template return IsSuccessStatusCode - ? System.Text.Json.JsonSerializer.Deserialize(RawContent, options ?? _jsonSerializerOptions) + ? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions) : default(T); } /// /// Returns true when the model can be deserialized /// - public bool TryToModel([NotNullWhen(true)] out T? model, System.Text.Json.JsonSerializerOptions? options = null) + public bool TryToModel([NotNullWhen(true)] out T? model) { try { - model = AsModel(options); + model = AsModel(); return model != null; } catch diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs index 4151923257b..0186178f4c3 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiResponse`1.cs @@ -144,22 +144,22 @@ namespace Org.OpenAPITools.Client /// /// Deserializes the server's response /// - public T AsModel(System.Text.Json.JsonSerializerOptions options = null) + public T AsModel() { // This logic may be modified with the AsModel.mustache template return IsSuccessStatusCode - ? System.Text.Json.JsonSerializer.Deserialize(RawContent, options ?? _jsonSerializerOptions) + ? System.Text.Json.JsonSerializer.Deserialize(RawContent, _jsonSerializerOptions) : default(T); } /// /// Returns true when the model can be deserialized /// - public bool TryToModel(out T model, System.Text.Json.JsonSerializerOptions options = null) + public bool TryToModel(out T model) { try { - model = AsModel(options); + model = AsModel(); return model != null; } catch