loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[aspnetcore] Fix nullable enum and duplicate model (#3622)

Browse Source 
* Fix enum nullable

* Update samples
This commit is contained in:
Juang, Yi-Lin 2019-08-13 13:49:16 +08:00 committed by William Cheng
parent 123efc5d65
commit f5327b601e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache vendored
View File

@ -18,7 +18,7 @@ namespace {{modelPackage}}
/// </summary>
[DataContract]
public {{#modelClassModifier}}{{modelClassModifier}} {{/modelClassModifier}}class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}}IEquatable<{{classname}}>
{ {{#vars}}{{#isEnum}}{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}{{>enumClass}}{{/items}}{{/items.isEnum}}
{ {{#vars}}{{#isEnum}}{{^isModel}}{{>enumClass}}{{/isModel}}{{/isEnum}}{{#items.isEnum}}{{^isModel}}{{#items}}{{>enumClass}}{{/items}}{{/isModel}}{{/items.isEnum}}
/// <summary>
/// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
/// </summary>{{#description}}
@ -31,7 +31,7 @@ namespace {{modelPackage}}
[Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}
[DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}})]
{{#isEnum}}
public {{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}?{{/isContainer}}{{/isEnum}} {{name}} { get; set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}
public {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}} {{name}} { get; set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}
{{/isEnum}}
{{^isEnum}}
public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}

2
samples/server/petstore/aspnetcore/.openapi-generator/VERSION
View File

@ -1 +1 @@
4.1.0-SNAPSHOT
4.1.1-SNAPSHOT

2
samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs
View File

@ -83,7 +83,7 @@ namespace Org.OpenAPITools.Models
/// </summary>
/// <value>Order Status</value>
[DataMember(Name="status", EmitDefaultValue=false)]
public StatusEnum? Status { get; set; }
public StatusEnum Status { get; set; }
/// <summary>
/// Gets or Sets Complete

2
samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs
View File

@ -91,7 +91,7 @@ namespace Org.OpenAPITools.Models
/// </summary>
/// <value>pet status in the store</value>
[DataMember(Name="status", EmitDefaultValue=false)]
public StatusEnum? Status { get; set; }
public StatusEnum Status { get; set; }
/// <summary>
/// Returns the string presentation of the object