Skip to content

Madhus1218 fix csharp generichost oneof serialization #24735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wing328 wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Madhus1218 fix csharp generichost oneof serialization #24735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6aa83f
fix(csharp): serialize oneOf referenced models in generichost
madhus1218 Aug 11, 2026
e55db64
fix(csharp): handle generichost oneOf converter edge cases
madhus1218 Aug 11, 2026
2d90388
Merge branch 'fix-csharp-generichost-oneof-serialization' of https://…
wing328 Aug 19, 2026
1b3eaca
update samples
wing328 Aug 19, 2026
32deebc
update samples
wing328 Aug 19, 2026
33c9825
update samples
wing328 Aug 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions .../openapi-generator/src/main/resources/csharp/libraries/generichost/JsonConverter.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,41 @@

{{/children}}
{{/discriminator}}
{{^model.discriminator}}
{{#composedSchemas}}
{{#oneOf}}
{{^vendorExtensions.x-duplicated-data-type}}
{{#isPrimitiveType}}
if ({{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}} != null)
{
JsonSerializer.Serialize(writer, {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}, jsonSerializerOptions);
return;
}

{{/isPrimitiveType}}
{{/vendorExtensions.x-duplicated-data-type}}
{{/oneOf}}
{{/composedSchemas}}
{{/model.discriminator}}
writer.WriteStartObject();
{{^model.discriminator}}
{{#composedSchemas}}
{{#oneOf}}
{{^vendorExtensions.x-duplicated-data-type}}
{{#isModel}}
{{^isContainer}}
if ({{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}} != null)
{
{{baseType}}JsonConverter {{#lambda.camelcase_sanitize_param}}{{baseType}}JsonConverter{{/lambda.camelcase_sanitize_param}} = new {{baseType}}JsonConverter();
{{#lambda.camelcase_sanitize_param}}{{baseType}}JsonConverter{{/lambda.camelcase_sanitize_param}}.WriteProperties(writer, {{#lambda.camelcase_sanitize_param}}{{classname}}{{/lambda.camelcase_sanitize_param}}.{{name}}, jsonSerializerOptions);
}

{{/isContainer}}
{{/isModel}}
{{/vendorExtensions.x-duplicated-data-type}}
{{/oneOf}}
{{/composedSchemas}}
{{/model.discriminator}}

{{#model.discriminator}}
{{#model.hasDiscriminatorWithNonEmptyMapping}}
Expand Down
12 changes: 12 additions & 0 deletions ...e/csharp/generichost/latest/AnnotatedEnum/src/Org.OpenAPITools/Model/OneOfNullableTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,18 @@ public override OneOfNullableTest Read(ref Utf8JsonReader utf8JsonReader, Type t
/// <exception cref="NotImplementedException"></exception>
public override void Write(Utf8JsonWriter writer, OneOfNullableTest oneOfNullableTest, JsonSerializerOptions jsonSerializerOptions)
{
if (oneOfNullableTest.Int != null)
{
JsonSerializer.Serialize(writer, oneOfNullableTest.Int, jsonSerializerOptions);
return;
}

if (oneOfNullableTest.String != null)
{
JsonSerializer.Serialize(writer, oneOfNullableTest.String, jsonSerializerOptions);
return;
}

writer.WriteStartObject();

WriteProperties(writer, oneOfNullableTest, jsonSerializerOptions);
Expand Down
12 changes: 12 additions & 0 deletions ...st/latest/AnnotatedEnum/src/Org.OpenAPITools/Model/ParentWithPluralOneOfPropertyNumber.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,18 @@ public override ParentWithPluralOneOfPropertyNumber Read(ref Utf8JsonReader utf8
/// <exception cref="NotImplementedException"></exception>
public override void Write(Utf8JsonWriter writer, ParentWithPluralOneOfPropertyNumber parentWithPluralOneOfPropertyNumber, JsonSerializerOptions jsonSerializerOptions)
{
if (parentWithPluralOneOfPropertyNumber.Number != null)
{
JsonSerializer.Serialize(writer, parentWithPluralOneOfPropertyNumber.Number, jsonSerializerOptions);
return;
}

if (parentWithPluralOneOfPropertyNumber.Number2 != null)
{
JsonSerializer.Serialize(writer, parentWithPluralOneOfPropertyNumber.Number2, jsonSerializerOptions);
return;
}

writer.WriteStartObject();

WriteProperties(writer, parentWithPluralOneOfPropertyNumber, jsonSerializerOptions);
Expand Down
6 changes: 6 additions & 0 deletions ...store/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Model/OneOfArrayRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,12 @@ public override OneOfArrayRequest Read(ref Utf8JsonReader utf8JsonReader, Type t
/// <exception cref="NotImplementedException"></exception>
public override void Write(Utf8JsonWriter writer, OneOfArrayRequest oneOfArrayRequest, JsonSerializerOptions jsonSerializerOptions)
{
if (oneOfArrayRequest.List != null)
{
JsonSerializer.Serialize(writer, oneOfArrayRequest.List, jsonSerializerOptions);
return;
}

writer.WriteStartObject();

WriteProperties(writer, oneOfArrayRequest, jsonSerializerOptions);
Expand Down
11 changes: 11 additions & 0 deletions .../petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/Fruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,17 @@ public override Fruit Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
public override void Write(Utf8JsonWriter writer, Fruit fruit, JsonSerializerOptions jsonSerializerOptions)
{
writer.WriteStartObject();
if (fruit.Apple != null)
{
AppleJsonConverter appleJsonConverter = new AppleJsonConverter();
appleJsonConverter.WriteProperties(writer, fruit.Apple, jsonSerializerOptions);
}

if (fruit.Banana != null)
{
BananaJsonConverter bananaJsonConverter = new BananaJsonConverter();
bananaJsonConverter.WriteProperties(writer, fruit.Banana, jsonSerializerOptions);
}

WriteProperties(writer, fruit, jsonSerializerOptions);
writer.WriteEndObject();
Expand Down
11 changes: 11 additions & 0 deletions ...tstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/FruitReq.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,17 @@ public override FruitReq Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
public override void Write(Utf8JsonWriter writer, FruitReq fruitReq, JsonSerializerOptions jsonSerializerOptions)
{
writer.WriteStartObject();
if (fruitReq.AppleReq != null)
{
AppleReqJsonConverter appleReqJsonConverter = new AppleReqJsonConverter();
appleReqJsonConverter.WriteProperties(writer, fruitReq.AppleReq, jsonSerializerOptions);
}

if (fruitReq.BananaReq != null)
{
BananaReqJsonConverter bananaReqJsonConverter = new BananaReqJsonConverter();
bananaReqJsonConverter.WriteProperties(writer, fruitReq.BananaReq, jsonSerializerOptions);
}

WriteProperties(writer, fruitReq, jsonSerializerOptions);
writer.WriteEndObject();
Expand Down
29 changes: 29 additions & 0 deletions ...harp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/MixedOneOfContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,36 @@ public override MixedOneOfContent Read(ref Utf8JsonReader utf8JsonReader, Type t
/// <exception cref="NotImplementedException"></exception>
public override void Write(Utf8JsonWriter writer, MixedOneOfContent mixedOneOfContent, JsonSerializerOptions jsonSerializerOptions)
{
if (mixedOneOfContent.String != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.String, jsonSerializerOptions);
return;
}

if (mixedOneOfContent.Bool != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.Bool, jsonSerializerOptions);
return;
}

if (mixedOneOfContent.Int != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.Int, jsonSerializerOptions);
return;
}

if (mixedOneOfContent.Decimal != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.Decimal, jsonSerializerOptions);
return;
}

writer.WriteStartObject();
if (mixedOneOfContent.MixedSubId != null)
{
MixedSubIdJsonConverter mixedSubIdJsonConverter = new MixedSubIdJsonConverter();
mixedSubIdJsonConverter.WriteProperties(writer, mixedOneOfContent.MixedSubId, jsonSerializerOptions);
}

WriteProperties(writer, mixedOneOfContent, jsonSerializerOptions);
writer.WriteEndObject();
Expand Down
6 changes: 6 additions & 0 deletions ...ore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/OneOfString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ public override OneOfString Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
/// <exception cref="NotImplementedException"></exception>
public override void Write(Utf8JsonWriter writer, OneOfString oneOfString, JsonSerializerOptions jsonSerializerOptions)
{
if (oneOfString.String != null)
{
JsonSerializer.Serialize(writer, oneOfString.String, jsonSerializerOptions);
return;
}

writer.WriteStartObject();

WriteProperties(writer, oneOfString, jsonSerializerOptions);
Expand Down
24 changes: 24 additions & 0 deletions ...rp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,30 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
/// <exception cref="NotImplementedException"></exception>
public override void Write(Utf8JsonWriter writer, PolymorphicProperty polymorphicProperty, JsonSerializerOptions jsonSerializerOptions)
{
if (polymorphicProperty.Bool != null)
{
JsonSerializer.Serialize(writer, polymorphicProperty.Bool, jsonSerializerOptions);
return;
}

if (polymorphicProperty.String != null)
{
JsonSerializer.Serialize(writer, polymorphicProperty.String, jsonSerializerOptions);
return;
}

if (polymorphicProperty.Object != null)
{
JsonSerializer.Serialize(writer, polymorphicProperty.Object, jsonSerializerOptions);
return;
}

if (polymorphicProperty.List != null)
{
JsonSerializer.Serialize(writer, polymorphicProperty.List, jsonSerializerOptions);
return;
}

writer.WriteStartObject();

WriteProperties(writer, polymorphicProperty, jsonSerializerOptions);
Expand Down
11 changes: 11 additions & 0 deletions ...s/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/Fruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,17 @@ public override Fruit Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
public override void Write(Utf8JsonWriter writer, Fruit fruit, JsonSerializerOptions jsonSerializerOptions)
{
writer.WriteStartObject();
if (fruit.Apple != null)
{
AppleJsonConverter appleJsonConverter = new AppleJsonConverter();
appleJsonConverter.WriteProperties(writer, fruit.Apple, jsonSerializerOptions);
}

if (fruit.Banana != null)
{
BananaJsonConverter bananaJsonConverter = new BananaJsonConverter();
bananaJsonConverter.WriteProperties(writer, fruit.Banana, jsonSerializerOptions);
}

WriteProperties(writer, fruit, jsonSerializerOptions);
writer.WriteEndObject();
Expand Down
11 changes: 11 additions & 0 deletions ...lient/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/FruitReq.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,17 @@ public override FruitReq Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
public override void Write(Utf8JsonWriter writer, FruitReq fruitReq, JsonSerializerOptions jsonSerializerOptions)
{
writer.WriteStartObject();
if (fruitReq.AppleReq != null)
{
AppleReqJsonConverter appleReqJsonConverter = new AppleReqJsonConverter();
appleReqJsonConverter.WriteProperties(writer, fruitReq.AppleReq, jsonSerializerOptions);
}

if (fruitReq.BananaReq != null)
{
BananaReqJsonConverter bananaReqJsonConverter = new BananaReqJsonConverter();
bananaReqJsonConverter.WriteProperties(writer, fruitReq.BananaReq, jsonSerializerOptions);
}

WriteProperties(writer, fruitReq, jsonSerializerOptions);
writer.WriteEndObject();
Expand Down
29 changes: 29 additions & 0 deletions ...store/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/MixedOneOfContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,36 @@ public override MixedOneOfContent Read(ref Utf8JsonReader utf8JsonReader, Type t
/// <exception cref="NotImplementedException"></exception>
public override void Write(Utf8JsonWriter writer, MixedOneOfContent mixedOneOfContent, JsonSerializerOptions jsonSerializerOptions)
{
if (mixedOneOfContent.String != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.String, jsonSerializerOptions);
return;
}

if (mixedOneOfContent.Bool != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.Bool, jsonSerializerOptions);
return;
}

if (mixedOneOfContent.Int != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.Int, jsonSerializerOptions);
return;
}

if (mixedOneOfContent.Decimal != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.Decimal, jsonSerializerOptions);
return;
}

writer.WriteStartObject();
if (mixedOneOfContent.MixedSubId != null)
{
MixedSubIdJsonConverter mixedSubIdJsonConverter = new MixedSubIdJsonConverter();
mixedSubIdJsonConverter.WriteProperties(writer, mixedOneOfContent.MixedSubId, jsonSerializerOptions);
}

WriteProperties(writer, mixedOneOfContent, jsonSerializerOptions);
writer.WriteEndObject();
Expand Down
6 changes: 6 additions & 0 deletions ...nt/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/OneOfString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@ public override OneOfString Read(ref Utf8JsonReader utf8JsonReader, Type typeToC
/// <exception cref="NotImplementedException"></exception>
public override void Write(Utf8JsonWriter writer, OneOfString oneOfString, JsonSerializerOptions jsonSerializerOptions)
{
if (oneOfString.String != null)
{
JsonSerializer.Serialize(writer, oneOfString.String, jsonSerializerOptions);
return;
}

writer.WriteStartObject();

WriteProperties(writer, oneOfString, jsonSerializerOptions);
Expand Down
24 changes: 24 additions & 0 deletions ...ore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,30 @@ public override PolymorphicProperty Read(ref Utf8JsonReader utf8JsonReader, Type
/// <exception cref="NotImplementedException"></exception>
public override void Write(Utf8JsonWriter writer, PolymorphicProperty polymorphicProperty, JsonSerializerOptions jsonSerializerOptions)
{
if (polymorphicProperty.Bool != null)
{
JsonSerializer.Serialize(writer, polymorphicProperty.Bool, jsonSerializerOptions);
return;
}

if (polymorphicProperty.String != null)
{
JsonSerializer.Serialize(writer, polymorphicProperty.String, jsonSerializerOptions);
return;
}

if (polymorphicProperty.Object != null)
{
JsonSerializer.Serialize(writer, polymorphicProperty.Object, jsonSerializerOptions);
return;
}

if (polymorphicProperty.List != null)
{
JsonSerializer.Serialize(writer, polymorphicProperty.List, jsonSerializerOptions);
return;
}

writer.WriteStartObject();

WriteProperties(writer, polymorphicProperty, jsonSerializerOptions);
Expand Down
11 changes: 11 additions & 0 deletions .../petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/Fruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,17 @@ public override Fruit Read(ref Utf8JsonReader utf8JsonReader, Type typeToConvert
public override void Write(Utf8JsonWriter writer, Fruit fruit, JsonSerializerOptions jsonSerializerOptions)
{
writer.WriteStartObject();
if (fruit.Apple != null)
{
AppleJsonConverter appleJsonConverter = new AppleJsonConverter();
appleJsonConverter.WriteProperties(writer, fruit.Apple, jsonSerializerOptions);
}

if (fruit.Banana != null)
{
BananaJsonConverter bananaJsonConverter = new BananaJsonConverter();
bananaJsonConverter.WriteProperties(writer, fruit.Banana, jsonSerializerOptions);
}

WriteProperties(writer, fruit, jsonSerializerOptions);
writer.WriteEndObject();
Expand Down
11 changes: 11 additions & 0 deletions ...tstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/FruitReq.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,17 @@ public override FruitReq Read(ref Utf8JsonReader utf8JsonReader, Type typeToConv
public override void Write(Utf8JsonWriter writer, FruitReq fruitReq, JsonSerializerOptions jsonSerializerOptions)
{
writer.WriteStartObject();
if (fruitReq.AppleReq != null)
{
AppleReqJsonConverter appleReqJsonConverter = new AppleReqJsonConverter();
appleReqJsonConverter.WriteProperties(writer, fruitReq.AppleReq, jsonSerializerOptions);
}

if (fruitReq.BananaReq != null)
{
BananaReqJsonConverter bananaReqJsonConverter = new BananaReqJsonConverter();
bananaReqJsonConverter.WriteProperties(writer, fruitReq.BananaReq, jsonSerializerOptions);
}

WriteProperties(writer, fruitReq, jsonSerializerOptions);
writer.WriteEndObject();
Expand Down
29 changes: 29 additions & 0 deletions ...harp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Model/MixedOneOfContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,36 @@ public override MixedOneOfContent Read(ref Utf8JsonReader utf8JsonReader, Type t
/// <exception cref="NotImplementedException"></exception>
public override void Write(Utf8JsonWriter writer, MixedOneOfContent mixedOneOfContent, JsonSerializerOptions jsonSerializerOptions)
{
if (mixedOneOfContent.String != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.String, jsonSerializerOptions);
return;
}

if (mixedOneOfContent.Bool != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.Bool, jsonSerializerOptions);
return;
}

if (mixedOneOfContent.Int != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.Int, jsonSerializerOptions);
return;
}

if (mixedOneOfContent.Decimal != null)
{
JsonSerializer.Serialize(writer, mixedOneOfContent.Decimal, jsonSerializerOptions);
return;
}

writer.WriteStartObject();
if (mixedOneOfContent.MixedSubId != null)
{
MixedSubIdJsonConverter mixedSubIdJsonConverter = new MixedSubIdJsonConverter();
mixedSubIdJsonConverter.WriteProperties(writer, mixedOneOfContent.MixedSubId, jsonSerializerOptions);
}

WriteProperties(writer, mixedOneOfContent, jsonSerializerOptions);
writer.WriteEndObject();
Expand Down
Loading
Loading