OneOf should handle Inheritance based type (#18892)

OpenAPITools · Jun 15, 2024 · 3d93862 · 3d93862
1 parent 642b1a3
commit 3d93862
Show file tree

Hide file tree

Showing 97 changed files with 241 additions and 241 deletions.
diff --git a/modules/openapi-generator/src/main/resources/csharp/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/csharp/modelOneOf.mustache
@@ -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;
                 }

diff --git a/...lient/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Fruit.cs b/...lient/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Fruit.cs
@@ -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;
                 }

diff --git a/...nt/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/FruitReq.cs b/...nt/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/FruitReq.cs
@@ -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;
                 }

diff --git a/...ient/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Mammal.cs b/...ient/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Mammal.cs
@@ -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;
                 }

diff --git a/...re/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MixedOneOfContent.cs b/...re/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/MixedOneOfContent.cs
@@ -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;
                 }

diff --git a/...tstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs b/...tstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -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;
                 }

diff --git a/...petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs b/...petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs
@@ -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;
                 }

diff --git a/.../client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pig.cs b/.../client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Pig.cs
@@ -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;
                 }

diff --git a/.../csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/.../csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
@@ -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;
                 }

diff --git a/...tstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Quadrilateral.cs b/...tstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Quadrilateral.cs
@@ -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;
                 }

diff --git a/...lient/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Shape.cs b/...lient/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Shape.cs
@@ -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;
                 }

diff --git a/...petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/...petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -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;
                 }

diff --git a/...nt/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Triangle.cs b/...nt/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Model/Triangle.cs
@@ -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;
                 }

diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Fruit.cs
@@ -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;
                 }

diff --git a/...s/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/FruitReq.cs b/...s/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/FruitReq.cs
@@ -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;
                 }

diff --git a/...les/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Mammal.cs b/...les/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Mammal.cs
@@ -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;
                 }

diff --git a/...petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/MixedOneOfContent.cs b/...petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/MixedOneOfContent.cs
@@ -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;
                 }

diff --git a/...ent/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs b/...ent/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -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;
                 }

diff --git a/...lient/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs b/...lient/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/OneOfString.cs
@@ -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;
                 }

diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Pig.cs
@@ -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;
                 }

diff --git a/...tstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/...tstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/PolymorphicProperty.cs
@@ -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;
                 }

diff --git a/...ent/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Quadrilateral.cs b/...ent/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Quadrilateral.cs
@@ -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;
                 }

diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/Shape.cs
@@ -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;
                 }

diff --git a/...lient/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/...lient/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -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;
                 }