From e6d32016236aab95abdfdbd7a853071b61f03089 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 26 Aug 2020 09:36:11 +0800 Subject: [PATCH] [c-sharp] Fix default values with discriminator (#7296) * [c-sharp] Fix #6225 default values with discriminator * [c-sharp] Fix #6225 default values with discriminator * update samples Co-authored-by: Tom E <1036527+thommy101@users.noreply.github.com> --- .../openapitools/codegen/languages/CSharpClientCodegen.java | 2 +- .../codegen/languages/CSharpNetCoreClientCodegen.java | 2 +- .../OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs | 4 ++-- .../OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs | 4 ++-- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs | 4 ++-- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs | 4 ++-- .../OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs | 4 ++-- .../csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs | 2 +- .../csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java index 1d47c0b4e9bf..78155a74ea09 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java @@ -604,7 +604,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { } for (final CodegenProperty property : codegenModel.readWriteVars) { - if (property.defaultValue == null && parentCodegenModel.discriminator != null && property.baseName.equals(parentCodegenModel.discriminator.getPropertyName())) { + if (property.defaultValue == null && parentCodegenModel.discriminator != null && property.name.equals(parentCodegenModel.discriminator.getPropertyName())) { property.defaultValue = "\"" + name + "\""; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index 0e189813db70..c97787acddf9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -299,7 +299,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { } for (final CodegenProperty property : codegenModel.readWriteVars) { - if (property.defaultValue == null && parentCodegenModel.discriminator != null && property.baseName.equals(parentCodegenModel.discriminator.getPropertyName())) { + if (property.defaultValue == null && parentCodegenModel.discriminator != null && property.name.equals(parentCodegenModel.discriminator.getPropertyName())) { property.defaultValue = "\"" + name + "\""; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs index 1633be4289c7..36301ec6388d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs @@ -40,9 +40,9 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// declawed. - /// className (required). + /// className (required) (default to "Cat"). /// color (default to "red"). - public Cat(bool declawed = default(bool), string className = default(string), string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) { this.Declawed = declawed; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs index 509bd8813c13..15b7a28ef1a4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs @@ -40,9 +40,9 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// breed. - /// className (required). + /// className (required) (default to "Dog"). /// color (default to "red"). - public Dog(string breed = default(string), string className = default(string), string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) { this.Breed = breed; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs index 1633be4289c7..36301ec6388d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs @@ -40,9 +40,9 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// declawed. - /// className (required). + /// className (required) (default to "Cat"). /// color (default to "red"). - public Cat(bool declawed = default(bool), string className = default(string), string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) { this.Declawed = declawed; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs index 509bd8813c13..15b7a28ef1a4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs @@ -40,9 +40,9 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// breed. - /// className (required). + /// className (required) (default to "Dog"). /// color (default to "red"). - public Dog(string breed = default(string), string className = default(string), string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) { this.Breed = breed; } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs index 1ac128d23105..05d8a67ce611 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ParentPet.cs @@ -39,8 +39,8 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// petType (required). - public ParentPet(string petType = default(string)) : base(petType) + /// petType (required) (default to "ParentPet"). + public ParentPet(string petType = "ParentPet") : base(petType) { } diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs index 1c28fb2755f7..e4cfa3fbef4d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs @@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// declawed. - public Cat(bool declawed = default(bool), string className = default(string), string color = "red") : base(className, color) + public Cat(bool declawed = default(bool), string className = "Cat", string color = "red") : base(className, color) { this.Declawed = declawed; } diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs index 96e568628fe5..b925fb99c324 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs @@ -39,7 +39,7 @@ namespace Org.OpenAPITools.Model /// Initializes a new instance of the class. /// /// breed. - public Dog(string breed = default(string), string className = default(string), string color = "red") : base(className, color) + public Dog(string breed = default(string), string className = "Dog", string color = "red") : base(className, color) { this.Breed = breed; }