From 796bd216c9fbec799f2c41187457f83a3ffe826f Mon Sep 17 00:00:00 2001 From: Yi-Lin Juang Date: Tue, 13 Aug 2019 01:28:31 +0800 Subject: [PATCH 1/2] Fix enum nullable --- .../src/main/resources/aspnetcore/2.1/model.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache index bf1cb3902fc3..bab4d2a71296 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache @@ -18,7 +18,7 @@ namespace {{modelPackage}} /// [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}} /// /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} /// @@ -33,7 +33,7 @@ namespace {{modelPackage}} {{/pattern}} [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}} From 5322a613f554deb2fd5b5614b0b229d7c542bd0d Mon Sep 17 00:00:00 2001 From: Yi-Lin Juang Date: Tue, 13 Aug 2019 01:34:58 +0800 Subject: [PATCH 2/2] Update samples --- samples/server/petstore/aspnetcore/.openapi-generator/VERSION | 2 +- .../petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs | 2 +- .../petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION index 83a328a9227e..2f81801b7943 100644 --- a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION @@ -1 +1 @@ -4.1.0-SNAPSHOT \ No newline at end of file +4.1.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs index c045601e12e0..a1715221ba26 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs @@ -83,7 +83,7 @@ public enum StatusEnum /// /// Order Status [DataMember(Name="status", EmitDefaultValue=false)] - public StatusEnum? Status { get; set; } + public StatusEnum Status { get; set; } /// /// Gets or Sets Complete diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs index a5bc9faa07ec..cb8a2001f17f 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs @@ -91,7 +91,7 @@ public enum StatusEnum /// /// pet status in the store [DataMember(Name="status", EmitDefaultValue=false)] - public StatusEnum? Status { get; set; } + public StatusEnum Status { get; set; } /// /// Returns the string presentation of the object