From c9ebf04b52ba3a282c22e276b9f46ed01a9728e7 Mon Sep 17 00:00:00 2001 From: Inf1mum Date: Mon, 16 Nov 2026 16:55:40 +0300 Subject: [PATCH] [csharp][generichost] register the generic string enum converter last JsonStringEnumConverter matches every enum type and System.Text.Json uses the first matching converter registered in JsonSerializerOptions.Converters, so registering it before the generated schema-specific enum converters shadowed them. Enum arrays and standalone enums were serialized with C# member names instead of the wire values declared by the schema. Register the generic converter after the generated per-schema converters, add a generator regression test asserting the order, and regenerate the csharp-generichost samples. Signed-off-by: Inf1mum --- .../generichost/HostConfiguration.mustache | 3 +- .../CSharpClientCodegenTest.java | 32 +++++++++++++++++++ .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 1 + .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- .../Client/HostConfiguration.cs | 3 +- 53 files changed, 135 insertions(+), 51 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache index 3343272886a7..ab24e61fe697 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache @@ -36,7 +36,6 @@ namespace {{packageName}}.{{clientPackage}} public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); {{#models}} {{#model}} {{#isEnum}} @@ -48,6 +47,8 @@ namespace {{packageName}}.{{clientPackage}} {{/isEnum}} {{/model}} {{/models}} + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new{{^net60OrLater}} JsonSerializerOptionsProvider{{/net60OrLater}}(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); {{#useSourceGeneration}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java index bc98a2a656ab..ee86033c1e44 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharpnetcore/CSharpClientCodegenTest.java @@ -215,6 +215,38 @@ public void testGenericHostWritesUnsetAndNullInnerStringEnums() throws IOExcepti + " writer.WriteString(\"kind\", kindRawValue); }"); } + @Test + public void testGenericHostRegistersGenericStringEnumConverterLast() throws IOException { + OpenAPI openAPI = new OpenAPI().components(new Components().addSchemas("Day", + new StringSchema()._enum(List.of("monday", "tuesday")))); + + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + DefaultGenerator generator = new DefaultGenerator(); + ClientOptInput input = new ClientOptInput().openAPI(openAPI); + CSharpClientCodegen codegen = new CSharpClientCodegen(); + codegen.setLibrary("generichost"); + codegen.setOutputDir(output.getAbsolutePath()); + input.config(codegen); + + Map files = generator.opts(input).generate().stream() + .collect(Collectors.toMap(File::getPath, Function.identity())); + File hostConfiguration = files.get(Paths.get(output.getAbsolutePath(), + "src", "Org.OpenAPITools", "Client", "HostConfiguration.cs").toString()); + assertNotNull(hostConfiguration); + // The generic JsonStringEnumConverter matches every enum, and System.Text.Json + // uses the first matching converter, so it must be registered after the + // generated schema-specific converters. + String content = Files.readString(hostConfiguration.toPath()); + int schemaSpecific = content.indexOf("new DayJsonConverter()"); + int schemaSpecificNullable = content.indexOf("new DayNullableJsonConverter()"); + int generic = content.indexOf("new JsonStringEnumConverter()"); + assertThat(schemaSpecific).isGreaterThanOrEqualTo(0); + assertThat(schemaSpecificNullable).isGreaterThanOrEqualTo(0); + assertThat(generic).isGreaterThan(schemaSpecific); + assertThat(generic).isGreaterThan(schemaSpecificNullable); + } + @Test public void testGenericHostOneOfConstructorsRespectApiVisibility() throws IOException { Map publicModels = generateIssue23046Models(false); diff --git a/samples/client/petstore/csharp/generichost/latest/AnnotatedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/latest/AnnotatedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs index edec84a13575..3018c6990391 100644 --- a/samples/client/petstore/csharp/generichost/latest/AnnotatedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/latest/AnnotatedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,7 +38,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AnyOfStringArrayOfStringJsonConverter()); _jsonOptions.Converters.Add(new NumberJsonConverter()); _jsonOptions.Converters.Add(new NumberNullableJsonConverter()); @@ -57,6 +56,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new SingleAnyOfTestNullableJsonConverter()); _jsonOptions.Converters.Add(new TypeIntegerWithOneOfJsonConverter()); _jsonOptions.Converters.Add(new TypeIntegerWithOneOfNullableJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs index 8668748b4d5a..7ad7453d15e8 100644 --- a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,13 +38,14 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AreaCodeJsonConverter()); _jsonOptions.Converters.Add(new AreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new MarineAreaCodeJsonConverter()); _jsonOptions.Converters.Add(new MarineAreaCodeNullableJsonConverter()); _jsonOptions.Converters.Add(new StateTerritoryCodeJsonConverter()); _jsonOptions.Converters.Add(new StateTerritoryCodeNullableJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/HostConfiguration.cs index 45142735cc91..f4f7f9369adb 100644 --- a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,8 +38,9 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new HelloWorldPostRequestJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index abd523c8f50c..67ca0072ab33 100644 --- a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,12 +38,13 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new FooJsonConverter()); _jsonOptions.Converters.Add(new IconsDefaultResponseJsonConverter()); _jsonOptions.Converters.Add(new IconsSizeParameterJsonConverter()); _jsonOptions.Converters.Add(new IconsSizeParameterAnyOfJsonConverter()); _jsonOptions.Converters.Add(new IconsSizeParameterAnyOfNullableJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs index 85ccb857ba8e..b0939e640eb2 100644 --- a/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,13 +38,14 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ColorJsonConverter()); _jsonOptions.Converters.Add(new ColorOrNullJsonConverter()); _jsonOptions.Converters.Add(new NullTypeDirectJsonConverter()); _jsonOptions.Converters.Add(new ShapeJsonConverter()); _jsonOptions.Converters.Add(new ShapeOrNullJsonConverter()); _jsonOptions.Converters.Add(new WidgetJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/HostConfiguration.cs index 2a916f5d48a2..6c8ffe5a3d3b 100644 --- a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,9 +38,10 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new OneOfArrayRequestJsonConverter()); _jsonOptions.Converters.Add(new TestObjectJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/HostConfiguration.cs index 2705d9e482ed..888fb97434e8 100644 --- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,6 +38,7 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); diff --git a/samples/client/petstore/csharp/generichost/latest/UnionMembers/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/latest/UnionMembers/src/Org.OpenAPITools/Client/HostConfiguration.cs index ac683872adf9..a48be55776b8 100644 --- a/samples/client/petstore/csharp/generichost/latest/UnionMembers/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/latest/UnionMembers/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,7 +38,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new AssetJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); @@ -65,6 +64,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new StatusJsonConverter()); _jsonOptions.Converters.Add(new StatusNullableJsonConverter()); _jsonOptions.Converters.Add(new StatusOrTextJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Client/HostConfiguration.cs index c48bf14fd2d8..82c4b3b04b12 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,7 +38,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -151,6 +150,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 4ab108269d32..b0dee2ccff0a 100644 --- a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,10 +38,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AdultJsonConverter()); _jsonOptions.Converters.Add(new ChildJsonConverter()); _jsonOptions.Converters.Add(new PersonJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 94445eb319dc..28485d178750 100644 --- a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,10 +38,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs index 94445eb319dc..28485d178750 100644 --- a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,10 +38,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index eb491a57f804..d5826a9ba0b3 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -199,6 +198,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs index c48bf14fd2d8..82c4b3b04b12 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,7 +38,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -151,6 +150,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 78283b145cbd..1aa187a7095e 100644 --- a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,11 +38,12 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); _jsonOptions.Converters.Add(new OrangeJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 9b0765296efd..3323b8e86f4d 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -149,6 +148,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs index f3cc5ad6e916..2aa3e800e3e8 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,7 +38,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -151,6 +150,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); diff --git a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs index 650251e9f70c..a6f7c3fdd6a0 100644 --- a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,8 +38,9 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new NowGet200ResponseJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 9341f7fe1e5d..3ea19b906a2b 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,10 +36,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AdultJsonConverter()); _jsonOptions.Converters.Add(new ChildJsonConverter()); _jsonOptions.Converters.Add(new PersonJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 8ca87ff08594..6b969e1ec947 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,10 +36,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs index 8ca87ff08594..6b969e1ec947 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,10 +36,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 5dc79fe3bd2c..212c3bd5a296 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -199,6 +198,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index d0c07dca1da7..98ae5804f2ce 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,11 +36,12 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); _jsonOptions.Converters.Add(new OrangeJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 1c2e0465cb7d..4952f5ee02b6 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -149,6 +148,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs index c574b0cedf38..f70deca36981 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,8 +36,9 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new NowGet200ResponseJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 9341f7fe1e5d..3ea19b906a2b 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,10 +36,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AdultJsonConverter()); _jsonOptions.Converters.Add(new ChildJsonConverter()); _jsonOptions.Converters.Add(new PersonJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 8ca87ff08594..6b969e1ec947 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,10 +36,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs index 8ca87ff08594..6b969e1ec947 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,10 +36,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 5dc79fe3bd2c..212c3bd5a296 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -199,6 +198,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index d0c07dca1da7..98ae5804f2ce 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,11 +36,12 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); _jsonOptions.Converters.Add(new OrangeJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 1c2e0465cb7d..4952f5ee02b6 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -149,6 +148,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs index c574b0cedf38..f70deca36981 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,8 +36,9 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new NowGet200ResponseJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 4ab108269d32..b0dee2ccff0a 100644 --- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,10 +38,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AdultJsonConverter()); _jsonOptions.Converters.Add(new ChildJsonConverter()); _jsonOptions.Converters.Add(new PersonJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 94445eb319dc..28485d178750 100644 --- a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,10 +38,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs index 94445eb319dc..28485d178750 100644 --- a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,10 +38,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index eb491a57f804..d5826a9ba0b3 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -199,6 +198,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs index c48bf14fd2d8..82c4b3b04b12 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,7 +38,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -151,6 +150,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 78283b145cbd..1aa187a7095e 100644 --- a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,11 +38,12 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); _jsonOptions.Converters.Add(new OrangeJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 9b0765296efd..3323b8e86f4d 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -149,6 +148,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs index f3cc5ad6e916..2aa3e800e3e8 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,7 +38,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -151,6 +150,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); diff --git a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs index 650251e9f70c..a6f7c3fdd6a0 100644 --- a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,8 +38,9 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new NowGet200ResponseJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 4ab108269d32..b0dee2ccff0a 100644 --- a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,10 +38,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AdultJsonConverter()); _jsonOptions.Converters.Add(new ChildJsonConverter()); _jsonOptions.Converters.Add(new PersonJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 94445eb319dc..28485d178750 100644 --- a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,10 +38,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs index 94445eb319dc..28485d178750 100644 --- a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,10 +38,11 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index eb491a57f804..d5826a9ba0b3 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -199,6 +198,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassZeroBasedEnumNullableJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs index c48bf14fd2d8..82c4b3b04b12 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,7 +38,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -151,6 +150,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 78283b145cbd..1aa187a7095e 100644 --- a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,11 +38,12 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new AppleJsonConverter()); _jsonOptions.Converters.Add(new BananaJsonConverter()); _jsonOptions.Converters.Add(new FruitJsonConverter()); _jsonOptions.Converters.Add(new OrangeJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 9b0765296efd..3323b8e86f4d 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -149,6 +148,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs index f3cc5ad6e916..2aa3e800e3e8 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,7 +38,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -151,6 +150,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); diff --git a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs index 650251e9f70c..a6f7c3fdd6a0 100644 --- a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -38,8 +38,9 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new NowGet200ResponseJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton(); diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs index 1c2e0465cb7d..4952f5ee02b6 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -36,7 +36,6 @@ public partial class HostConfiguration public HostConfiguration(IServiceCollection services) { _services = services; - _jsonOptions.Converters.Add(new JsonStringEnumConverter()); _jsonOptions.Converters.Add(new ActivityJsonConverter()); _jsonOptions.Converters.Add(new ActivityOutputElementRepresentationJsonConverter()); _jsonOptions.Converters.Add(new AdditionalPropertiesClassJsonConverter()); @@ -149,6 +148,8 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new ZeroBasedEnumJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumNullableJsonConverter()); _jsonOptions.Converters.Add(new ZeroBasedEnumClassJsonConverter()); + // Registered last so the generated schema-specific converters take precedence (System.Text.Json uses the first matching converter). + _jsonOptions.Converters.Add(new JsonStringEnumConverter()); JsonSerializerOptionsProvider jsonSerializerOptionsProvider = new JsonSerializerOptionsProvider(_jsonOptions); _services.AddSingleton(jsonSerializerOptionsProvider); _services.AddSingleton();