loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-06-28 19:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[C#] Fixed issue #1126 with invalid generation of C# children models in allOf clauses (#1127)

Browse Source 
* Run ./bin/utils/ensure-up-to-date to re-generate samples run in the CI.

* Fixed issue #1126. DefaultCodegen now sets the hasChildren property of CodegenModel when children models are added to the model. Changed the modelGeneric.mustache template to decide whether to include a base validation model (for children to inherit) based on the hasChildren property, and not the discriminator property.

* Run the ./bin/utils/ensure-up-to-date script after fixing the issue #1126

* Reverted modification in go samples, performed by ./bin/utils/ensure-up-to-date, that are failing in CI.

This partially reverts commit 2168df0f82d987ff8d50963d34efb269b015ef98.
This commit is contained in:
Rubén Martínez 2018-10-15 07:13:05 +02:00 committed by William Cheng
parent 12a702ee07
commit ded765bcb9
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View File

@ -239,6 +239,7 @@ public class DefaultCodegen implements CodegenConfig {
parent.setChildren(new ArrayList<CodegenModel>()); parent.setChildren(new ArrayList<CodegenModel>());
} }
parent.getChildren().add(cm); parent.getChildren().add(cm);
parent.hasChildren = true;
if (parent.getDiscriminator() == null) { if (parent.getDiscriminator() == null) {
parent = allModels.get(parent.getParent()); parent = allModels.get(parent.getParent());
} else { } else {

10
modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
View File

@ -217,7 +217,7 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}};
{{/generatePropertyChanged}} {{/generatePropertyChanged}}
{{#validatable}} {{#validatable}}
{{#discriminator}} {{#hasChildren}}
/// <summary> /// <summary>
/// To validate all properties of the instance /// To validate all properties of the instance
/// </summary> /// </summary>
@ -235,8 +235,8 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}};
/// <returns>Validation Result</returns> /// <returns>Validation Result</returns>
protected IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> BaseValidate(ValidationContext validationContext) protected IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> BaseValidate(ValidationContext validationContext)
{ {
{{/discriminator}} {{/hasChildren}}
{{^discriminator}} {{^hasChildren}}
/// <summary> /// <summary>
/// To validate all properties of the instance /// To validate all properties of the instance
/// </summary> /// </summary>
@ -244,11 +244,11 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}};
/// <returns>Validation Result</returns> /// <returns>Validation Result</returns>
IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext) IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
{ {
{{/discriminator}} {{/hasChildren}}
{{#parent}} {{#parent}}
{{^isArrayModel}} {{^isArrayModel}}
{{^isMapModel}} {{^isMapModel}}
foreach(var x in BaseValidate(validationContext)) yield return x; foreach(var x in base.BaseValidate(validationContext)) yield return x;
{{/isMapModel}} {{/isMapModel}}
{{/isArrayModel}} {{/isArrayModel}}
{{/parent}} {{/parent}}

2
samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Cat.cs
View File

@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
/// <returns>Validation Result</returns> /// <returns>Validation Result</returns>
IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext) IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
{ {
foreach(var x in BaseValidate(validationContext)) yield return x; foreach(var x in base.BaseValidate(validationContext)) yield return x;
yield break; yield break;
} }
} }

2
samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Dog.cs
View File

@ -123,7 +123,7 @@ namespace Org.OpenAPITools.Model
/// <returns>Validation Result</returns> /// <returns>Validation Result</returns>
IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext) IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
{ {
foreach(var x in BaseValidate(validationContext)) yield return x; foreach(var x in base.BaseValidate(validationContext)) yield return x;
yield break; yield break;
} }
} }