Skip to content
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

Jump to bottom

[csharp] OneOf should handle Inheritance based type #18892

Merged
merged 1 commit into from
Jun 15, 2024
Merged

[csharp] OneOf should handle Inheritance based type #18892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/csharp/modelOneOf.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
set
{
{{#oneOf}}
{{^-first}}else {{/-first}}if (value.GetType() == typeof({{{.}}}))
{{^-first}}else {{/-first}}if (value.GetType() == typeof({{{.}}}) || value is {{{.}}})
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions ...lient/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Fruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(Apple))
if (value.GetType() == typeof(Apple) || value is Apple)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Banana))
else if (value.GetType() == typeof(Banana) || value is Banana)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions ...nt/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/FruitReq.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(AppleReq))
if (value.GetType() == typeof(AppleReq) || value is AppleReq)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(BananaReq))
else if (value.GetType() == typeof(BananaReq) || value is BananaReq)
{
this._actualInstance = value;
}
Expand Down
6 changes: 3 additions & 3 deletions ...ient/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Mammal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(Pig))
if (value.GetType() == typeof(Pig) || value is Pig)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Whale))
else if (value.GetType() == typeof(Whale) || value is Whale)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Zebra))
else if (value.GetType() == typeof(Zebra) || value is Zebra)
{
this._actualInstance = value;
}
Expand Down
10 changes: 5 additions & 5 deletions ...re/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MixedOneOfContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,23 +109,23 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(MixedSubId))
if (value.GetType() == typeof(MixedSubId) || value is MixedSubId)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(bool))
else if (value.GetType() == typeof(bool) || value is bool)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(decimal))
else if (value.GetType() == typeof(decimal) || value is decimal)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(int))
else if (value.GetType() == typeof(int) || value is int)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(string))
else if (value.GetType() == typeof(string) || value is string)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions ...tstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(Quadrilateral))
if (value.GetType() == typeof(Quadrilateral) || value is Quadrilateral)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Triangle))
else if (value.GetType() == typeof(Triangle) || value is Triangle)
{
this._actualInstance = value;
}
Expand Down
2 changes: 1 addition & 1 deletion ...petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(string))
if (value.GetType() == typeof(string) || value is string)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions .../client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(BasquePig))
if (value.GetType() == typeof(BasquePig) || value is BasquePig)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(DanishPig))
else if (value.GetType() == typeof(DanishPig) || value is DanishPig)
{
this._actualInstance = value;
}
Expand Down
8 changes: 4 additions & 4 deletions .../csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,19 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(List<string>))
if (value.GetType() == typeof(List<string>) || value is List<string>)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Object))
else if (value.GetType() == typeof(Object) || value is Object)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(bool))
else if (value.GetType() == typeof(bool) || value is bool)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(string))
else if (value.GetType() == typeof(string) || value is string)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions ...tstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Quadrilateral.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(ComplexQuadrilateral))
if (value.GetType() == typeof(ComplexQuadrilateral) || value is ComplexQuadrilateral)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(SimpleQuadrilateral))
else if (value.GetType() == typeof(SimpleQuadrilateral) || value is SimpleQuadrilateral)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions ...lient/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Shape.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(Quadrilateral))
if (value.GetType() == typeof(Quadrilateral) || value is Quadrilateral)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Triangle))
else if (value.GetType() == typeof(Triangle) || value is Triangle)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions ...petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(Quadrilateral))
if (value.GetType() == typeof(Quadrilateral) || value is Quadrilateral)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Triangle))
else if (value.GetType() == typeof(Triangle) || value is Triangle)
{
this._actualInstance = value;
}
Expand Down
6 changes: 3 additions & 3 deletions ...nt/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Triangle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(EquilateralTriangle))
if (value.GetType() == typeof(EquilateralTriangle) || value is EquilateralTriangle)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(IsoscelesTriangle))
else if (value.GetType() == typeof(IsoscelesTriangle) || value is IsoscelesTriangle)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(ScaleneTriangle))
else if (value.GetType() == typeof(ScaleneTriangle) || value is ScaleneTriangle)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Fruit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(Apple))
if (value.GetType() == typeof(Apple) || value is Apple)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Banana))
else if (value.GetType() == typeof(Banana) || value is Banana)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions ...s/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/FruitReq.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(AppleReq))
if (value.GetType() == typeof(AppleReq) || value is AppleReq)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(BananaReq))
else if (value.GetType() == typeof(BananaReq) || value is BananaReq)
{
this._actualInstance = value;
}
Expand Down
6 changes: 3 additions & 3 deletions ...les/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Mammal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(Pig))
if (value.GetType() == typeof(Pig) || value is Pig)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Whale))
else if (value.GetType() == typeof(Whale) || value is Whale)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Zebra))
else if (value.GetType() == typeof(Zebra) || value is Zebra)
{
this._actualInstance = value;
}
Expand Down
10 changes: 5 additions & 5 deletions ...petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/MixedOneOfContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,23 +108,23 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(MixedSubId))
if (value.GetType() == typeof(MixedSubId) || value is MixedSubId)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(bool))
else if (value.GetType() == typeof(bool) || value is bool)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(decimal))
else if (value.GetType() == typeof(decimal) || value is decimal)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(int))
else if (value.GetType() == typeof(int) || value is int)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(string))
else if (value.GetType() == typeof(string) || value is string)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ent/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(Quadrilateral))
if (value.GetType() == typeof(Quadrilateral) || value is Quadrilateral)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Triangle))
else if (value.GetType() == typeof(Triangle) || value is Triangle)
{
this._actualInstance = value;
}
Expand Down
2 changes: 1 addition & 1 deletion ...lient/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(string))
if (value.GetType() == typeof(string) || value is string)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Pig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(BasquePig))
if (value.GetType() == typeof(BasquePig) || value is BasquePig)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(DanishPig))
else if (value.GetType() == typeof(DanishPig) || value is DanishPig)
{
this._actualInstance = value;
}
Expand Down
8 changes: 4 additions & 4 deletions ...tstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,19 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(List<string>))
if (value.GetType() == typeof(List<string>) || value is List<string>)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Object))
else if (value.GetType() == typeof(Object) || value is Object)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(bool))
else if (value.GetType() == typeof(bool) || value is bool)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(string))
else if (value.GetType() == typeof(string) || value is string)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ent/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Quadrilateral.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(ComplexQuadrilateral))
if (value.GetType() == typeof(ComplexQuadrilateral) || value is ComplexQuadrilateral)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(SimpleQuadrilateral))
else if (value.GetType() == typeof(SimpleQuadrilateral) || value is SimpleQuadrilateral)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Shape.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(Quadrilateral))
if (value.GetType() == typeof(Quadrilateral) || value is Quadrilateral)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Triangle))
else if (value.GetType() == typeof(Triangle) || value is Triangle)
{
this._actualInstance = value;
}
Expand Down
4 changes: 2 additions & 2 deletions ...lient/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ public override Object ActualInstance
}
set
{
if (value.GetType() == typeof(Quadrilateral))
if (value.GetType() == typeof(Quadrilateral) || value is Quadrilateral)
{
this._actualInstance = value;
}
else if (value.GetType() == typeof(Triangle))
else if (value.GetType() == typeof(Triangle) || value is Triangle)
{
this._actualInstance = value;
}
Expand Down
Loading
Loading