From 4dc7ffd2f354311c2bd5b3cefe00e1f980ca1788 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Sat, 1 Jul 2023 12:06:42 -0400 Subject: [PATCH] [csharp][generichost] Fix model accessor (#15918) * removed redundant properties * removed commneted code * fixed oneof anyof serialization * restored discriminator as a model property * added manual sample, removed need for new discriminator property * minor pipeline change * renamed manual test solution * fixed model accessor * used visibility option * resolved conflicts * build samples * resolved conflicts * resolved conflicts * resolved conflicts * resolved conflicts * added a comment --- .../languages/AbstractCSharpCodegen.java | 22 +++++++ .../generichost/modelGeneric.mustache | 4 +- .../UnitTest1.cs | 60 +++++++++---------- .../src/Org.OpenAPITools/Model/Fruit.cs | 4 +- .../src/Org.OpenAPITools/Model/FruitReq.cs | 4 +- .../src/Org.OpenAPITools/Model/Mammal.cs | 6 +- .../Org.OpenAPITools/Model/NullableShape.cs | 4 +- .../src/Org.OpenAPITools/Model/OneOfString.cs | 2 +- .../src/Org.OpenAPITools/Model/Pig.cs | 4 +- .../Model/PolymorphicProperty.cs | 8 +-- .../Org.OpenAPITools/Model/Quadrilateral.cs | 4 +- .../src/Org.OpenAPITools/Model/Shape.cs | 4 +- .../src/Org.OpenAPITools/Model/ShapeOrNull.cs | 4 +- .../src/Org.OpenAPITools/Model/Triangle.cs | 6 +- .../src/Org.OpenAPITools/Model/FruitReq.cs | 4 +- .../src/Org.OpenAPITools/Model/Fruit.cs | 4 +- .../src/Org.OpenAPITools/Model/FruitReq.cs | 4 +- 17 files changed, 85 insertions(+), 63 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index b4d0d5d117a7..741f584cf419 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -535,6 +535,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co for (Map.Entry entry : objs.entrySet()) { CodegenModel model = ModelUtils.getModelByName(entry.getKey(), objs); + model.vendorExtensions.put("x-model-is-mutatable", modelIsMutatable(model, null)); CodegenComposedSchemas composedSchemas = model.getComposedSchemas(); if (composedSchemas != null) { @@ -595,6 +596,27 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co return processed; } + /** + * Returns true if the model contains any properties with a public setter + * If true, the model's constructor accessor should be made public to ensure end users + * can instantiate the object. If false, then the model is only ever given + * to us by the server, so we do not need a public constructor + */ + private boolean modelIsMutatable(CodegenModel model, Set processed) { + if (processed == null) { + processed = new HashSet(); + } + Boolean isMutatable = model.allVars.stream().anyMatch(v -> !v.isReadOnly); + if (!isMutatable && !processed.contains(model.classname) && model.getDiscriminator() != null && model.getDiscriminator().getMappedModels() != null) { + processed.add(model.classname); + for (CodegenDiscriminator.MappedModel mappedModel : model.getDiscriminator().getMappedModels()) { + isMutatable = modelIsMutatable(model, processed); + } + } + + return isMutatable; + } + protected void removePropertiesDeclaredInComposedTypes(Map objs, CodegenModel model, List composedProperties) { } diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache index 582ea839cc54..412e6f2e70c0 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache @@ -16,7 +16,7 @@ /// {{description}}{{^description}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{/description}}{{#defaultValue}} (default to {{.}}){{/defaultValue}} {{/allVars}} [JsonConstructor] - {{#readWriteVars}}{{#-first}}public{{/-first}}{{/readWriteVars}}{{^readWriteVars}}internal{{/readWriteVars}} {{classname}}({{#lambda.joinWithComma}}{{{dataType}}}{{>NullConditionalProperty}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} {{#model.composedSchemas.anyOf}}{{{dataType}}}{{>NullConditionalProperty}} {{#lambda.camelcase_param}}{{baseType}}{{/lambda.camelcase_param}} {{/model.composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{#parentModel.composedSchemas.oneOf}}{{#lambda.camelcase_param}}{{parent}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}} {{/parentModel.composedSchemas.oneOf}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} + {{#model.vendorExtensions.x-model-is-mutatable}}{{>visibility}}{{/model.vendorExtensions.x-model-is-mutatable}}{{^model.vendorExtensions.x-model-is-mutatable}}internal{{/model.vendorExtensions.x-model-is-mutatable}} {{classname}}({{#lambda.joinWithComma}}{{{dataType}}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}} {{#model.composedSchemas.anyOf}}{{{dataType}}}{{>NullConditionalProperty}} {{#lambda.camelcase_param}}{{baseType}}{{/lambda.camelcase_param}} {{/model.composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{#parentModel.composedSchemas.oneOf}}{{#lambda.camelcase_param}}{{parent}}{{/lambda.camelcase_param}}.{{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}} {{/parentModel.composedSchemas.oneOf}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} { {{#composedSchemas.anyOf}} {{#lambda.titlecase}}{{baseType}}{{/lambda.titlecase}} = {{#lambda.camelcase_param}}{{baseType}}{{/lambda.camelcase_param}}; @@ -48,7 +48,7 @@ /// {{description}}{{^description}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{/description}}{{#defaultValue}} (default to {{.}}){{/defaultValue}} {{/allVars}} [JsonConstructor] - {{#readWriteVars}}{{#-first}}public{{/-first}}{{/readWriteVars}}{{^readWriteVars}}internal{{/readWriteVars}} {{classname}}({{#lambda.joinWithComma}}{{#composedSchemas.anyOf}}{{{name}}}{{>NullConditionalProperty}} {{#lambda.camelcase_param}}{{baseType}}{{/lambda.camelcase_param}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} + {{#model.vendorExtensions.x-model-is-mutatable}}{{>visibility}}{{/model.vendorExtensions.x-model-is-mutatable}}{{^model.vendorExtensions.x-model-is-mutatable}}internal{{/model.vendorExtensions.x-model-is-mutatable}} {{classname}}({{#lambda.joinWithComma}}{{#composedSchemas.anyOf}}{{{name}}}{{>NullConditionalProperty}} {{#lambda.camelcase_param}}{{baseType}}{{/lambda.camelcase_param}} {{/composedSchemas.anyOf}}{{>ModelSignature}}{{/lambda.joinWithComma}}){{#parent}} : base({{#lambda.joinWithComma}}{{>ModelBaseSignature}}{{/lambda.joinWithComma}}){{/parent}} { {{#composedSchemas.anyOf}} {{#lambda.titlecase}}{{name}}{{/lambda.titlecase}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs index fcd3e8d4f6bf..0951c1cfec80 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs @@ -53,21 +53,21 @@ namespace OpenAPIClient_generichost_manual_tests Assert.IsTrue(apple2 != null && apple.Cultivar.Equals(apple2.Cultivar) && apple.Origin.Equals(apple2.Origin)); } - //[TestMethod] - //public void Pig() - //{ - // BasquePig basquePig = new("BasquePig"); - // Pig pig = new(basquePig); - // string pigJson = JsonSerializer.Serialize(pig, _jsonSerializerOptions); - // Pig? pig2 = JsonSerializer.Deserialize(pigJson, _jsonSerializerOptions); - // Assert.IsTrue( - // pig.DanishPig == null && - // pig.BasquePig != null && - // pig2 != null && - // pig2.BasquePig != null && - // pig2.DanishPig == null && - // pig2.BasquePig.ClassName.Equals(pig.BasquePig.ClassName)); - //} + [TestMethod] + public void Pig() + { + BasquePig basquePig = new("BasquePig"); + Pig pig = new(basquePig, "BasquePig"); + string pigJson = JsonSerializer.Serialize(pig, _jsonSerializerOptions); + Pig? pig2 = JsonSerializer.Deserialize(pigJson, _jsonSerializerOptions); + Assert.IsTrue( + pig.DanishPig == null && + pig.BasquePig != null && + pig2 != null && + pig2.BasquePig != null && + pig2.DanishPig == null && + pig2.BasquePig.ClassName.Equals(pig.BasquePig.ClassName)); + } [TestMethod] public void DanishPig() @@ -110,21 +110,21 @@ namespace OpenAPIClient_generichost_manual_tests Assert.IsTrue(equilateralTriangle2 != null && equilateralTriangle.TriangleType.Equals(equilateralTriangle2.TriangleType) && equilateralTriangle.ShapeType.Equals(equilateralTriangle2.ShapeType)); } - //[TestMethod] - //public void Quadrilateral() - //{ - // ComplexQuadrilateral complexQuadrilateral = new("ComplexQuadrilateral", "shapeType"); - // Quadrilateral quadrilateral = new(complexQuadrilateral); - // string quadrilateralJson = JsonSerializer.Serialize(quadrilateral, _jsonSerializerOptions); - // Quadrilateral? quadrilateral2 = JsonSerializer.Deserialize(quadrilateralJson, _jsonSerializerOptions); - // Assert.IsTrue( - // quadrilateral.ComplexQuadrilateral != null && - // quadrilateral2 != null && - // quadrilateral2.SimpleQuadrilateral == null && - // quadrilateral2.ComplexQuadrilateral != null && - // quadrilateral2.ComplexQuadrilateral.QuadrilateralType.Equals(quadrilateral.ComplexQuadrilateral.QuadrilateralType) && - // quadrilateral2.ComplexQuadrilateral.ShapeType.Equals(quadrilateral.ComplexQuadrilateral.ShapeType)); - //} + [TestMethod] + public void Quadrilateral() + { + ComplexQuadrilateral complexQuadrilateral = new("ComplexQuadrilateral", "shapeType"); + Quadrilateral quadrilateral = new(complexQuadrilateral, "ComplexQuadrilateral"); + string quadrilateralJson = JsonSerializer.Serialize(quadrilateral, _jsonSerializerOptions); + Quadrilateral? quadrilateral2 = JsonSerializer.Deserialize(quadrilateralJson, _jsonSerializerOptions); + Assert.IsTrue( + quadrilateral.ComplexQuadrilateral != null && + quadrilateral2 != null && + quadrilateral2.SimpleQuadrilateral == null && + quadrilateral2.ComplexQuadrilateral != null && + quadrilateral2.ComplexQuadrilateral.QuadrilateralType.Equals(quadrilateral.ComplexQuadrilateral.QuadrilateralType) && + quadrilateral2.ComplexQuadrilateral.ShapeType.Equals(quadrilateral.ComplexQuadrilateral.ShapeType)); + } [TestMethod] public void ChildCat() diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs index 0ff022f078c5..052b183a0b1a 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Fruit.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// /// color [JsonConstructor] - public Fruit(Apple? apple, string color) + public Fruit(Apple apple, string color) { Apple = apple; Color = color; @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// color [JsonConstructor] - public Fruit(Banana? banana, string color) + public Fruit(Banana banana, string color) { Banana = banana; Color = color; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs index 976f8f3b3ed0..e416f0c22dc3 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/FruitReq.cs @@ -35,7 +35,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal FruitReq(AppleReq? appleReq) + public FruitReq(AppleReq appleReq) { AppleReq = appleReq; OnCreated(); @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal FruitReq(BananaReq? bananaReq) + public FruitReq(BananaReq bananaReq) { BananaReq = bananaReq; OnCreated(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs index ad99a274b4c1..a0f1a3f04bc5 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Mammal.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// /// className [JsonConstructor] - public Mammal(Whale? whale, string className) + public Mammal(Whale whale, string className) { Whale = whale; ClassName = className; @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// className [JsonConstructor] - public Mammal(Zebra? zebra, string className) + public Mammal(Zebra zebra, string className) { Zebra = zebra; ClassName = className; @@ -62,7 +62,7 @@ namespace Org.OpenAPITools.Model /// /// className [JsonConstructor] - public Mammal(Pig? pig, string className) + public Mammal(Pig pig, string className) { Pig = pig; ClassName = className; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs index 126aa9c39117..2820fcefee94 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/NullableShape.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// /// shapeType [JsonConstructor] - public NullableShape(Triangle? triangle, string shapeType) + public NullableShape(Triangle triangle, string shapeType) { Triangle = triangle; ShapeType = shapeType; @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// shapeType [JsonConstructor] - public NullableShape(Quadrilateral? quadrilateral, string shapeType) + public NullableShape(Quadrilateral quadrilateral, string shapeType) { Quadrilateral = quadrilateral; ShapeType = shapeType; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs index bc653d7c685c..c54aa667f25f 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/OneOfString.cs @@ -35,7 +35,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal OneOfString(string? varString) + internal OneOfString(string varString) { VarString = varString; OnCreated(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs index 92a2ff2f6d43..21329c90e180 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Pig.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// /// className [JsonConstructor] - public Pig(BasquePig? basquePig, string className) + public Pig(BasquePig basquePig, string className) { BasquePig = basquePig; ClassName = className; @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// className [JsonConstructor] - public Pig(DanishPig? danishPig, string className) + public Pig(DanishPig danishPig, string className) { DanishPig = danishPig; ClassName = className; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs index 50a32033043d..51c3b2d73fff 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/PolymorphicProperty.cs @@ -35,7 +35,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal PolymorphicProperty(bool? varBool) + internal PolymorphicProperty(bool varBool) { VarBool = varBool; OnCreated(); @@ -46,7 +46,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal PolymorphicProperty(string? varString) + internal PolymorphicProperty(string varString) { VarString = varString; OnCreated(); @@ -57,7 +57,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal PolymorphicProperty(Object? varObject) + internal PolymorphicProperty(Object varObject) { VarObject = varObject; OnCreated(); @@ -68,7 +68,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal PolymorphicProperty(List? list) + internal PolymorphicProperty(List list) { List = list; OnCreated(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs index 5b2b2048562a..6bd912e85988 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Quadrilateral.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// /// quadrilateralType [JsonConstructor] - public Quadrilateral(SimpleQuadrilateral? simpleQuadrilateral, string quadrilateralType) + public Quadrilateral(SimpleQuadrilateral simpleQuadrilateral, string quadrilateralType) { SimpleQuadrilateral = simpleQuadrilateral; QuadrilateralType = quadrilateralType; @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// quadrilateralType [JsonConstructor] - public Quadrilateral(ComplexQuadrilateral? complexQuadrilateral, string quadrilateralType) + public Quadrilateral(ComplexQuadrilateral complexQuadrilateral, string quadrilateralType) { ComplexQuadrilateral = complexQuadrilateral; QuadrilateralType = quadrilateralType; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs index b3c62dc279d6..f935fd0c9836 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Shape.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// /// shapeType [JsonConstructor] - public Shape(Triangle? triangle, string shapeType) + public Shape(Triangle triangle, string shapeType) { Triangle = triangle; ShapeType = shapeType; @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// shapeType [JsonConstructor] - public Shape(Quadrilateral? quadrilateral, string shapeType) + public Shape(Quadrilateral quadrilateral, string shapeType) { Quadrilateral = quadrilateral; ShapeType = shapeType; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs index 69dd9cc2d702..1ba60d00ab95 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/ShapeOrNull.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// /// shapeType [JsonConstructor] - public ShapeOrNull(Triangle? triangle, string shapeType) + public ShapeOrNull(Triangle triangle, string shapeType) { Triangle = triangle; ShapeType = shapeType; @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// shapeType [JsonConstructor] - public ShapeOrNull(Quadrilateral? quadrilateral, string shapeType) + public ShapeOrNull(Quadrilateral quadrilateral, string shapeType) { Quadrilateral = quadrilateral; ShapeType = shapeType; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs index 04f66c421399..0b075b36025e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/Triangle.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// /// triangleType [JsonConstructor] - public Triangle(EquilateralTriangle? equilateralTriangle, string triangleType) + public Triangle(EquilateralTriangle equilateralTriangle, string triangleType) { EquilateralTriangle = equilateralTriangle; TriangleType = triangleType; @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// triangleType [JsonConstructor] - public Triangle(IsoscelesTriangle? isoscelesTriangle, string triangleType) + public Triangle(IsoscelesTriangle isoscelesTriangle, string triangleType) { IsoscelesTriangle = isoscelesTriangle; TriangleType = triangleType; @@ -62,7 +62,7 @@ namespace Org.OpenAPITools.Model /// /// triangleType [JsonConstructor] - public Triangle(ScaleneTriangle? scaleneTriangle, string triangleType) + public Triangle(ScaleneTriangle scaleneTriangle, string triangleType) { ScaleneTriangle = scaleneTriangle; TriangleType = triangleType; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs index 49783eaff962..8d34bbece8a2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/FruitReq.cs @@ -33,7 +33,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal FruitReq(AppleReq appleReq) + public FruitReq(AppleReq appleReq) { AppleReq = appleReq; OnCreated(); @@ -44,7 +44,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal FruitReq(BananaReq bananaReq) + public FruitReq(BananaReq bananaReq) { BananaReq = bananaReq; OnCreated(); diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs index a7b07c511a5d..7d2fe297b549 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Model/Fruit.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model /// /// color [JsonConstructor] - public Fruit(Apple? apple, string color) + public Fruit(Apple apple, string color) { Apple = apple; Color = color; @@ -49,7 +49,7 @@ namespace Org.OpenAPITools.Model /// /// color [JsonConstructor] - public Fruit(Banana? banana, string color) + public Fruit(Banana banana, string color) { Banana = banana; Color = color; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs index 49783eaff962..8d34bbece8a2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/FruitReq.cs @@ -33,7 +33,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal FruitReq(AppleReq appleReq) + public FruitReq(AppleReq appleReq) { AppleReq = appleReq; OnCreated(); @@ -44,7 +44,7 @@ namespace Org.OpenAPITools.Model /// /// [JsonConstructor] - internal FruitReq(BananaReq bananaReq) + public FruitReq(BananaReq bananaReq) { BananaReq = bananaReq; OnCreated();