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

[aspnetcore] Fix duplicate enums (#5059)

Browse Source 
* [aspnetcore] Fix duplicate generation of enums

Fixes template issue where enums defined within a class were generated
regardless of whether they were a complexType (externally defined
"model") or an inlined enum.
This commit is contained in:
Jim Schubert 2020-01-20 16:37:15 -05:00 committed by GitHub
parent 7599531960
commit 2bc3c196e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache vendored
View File

@ -16,7 +16,20 @@ namespace {{packageName}}.Models
/// </summary> /// </summary>
[DataContract] [DataContract]
public partial class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}}IEquatable<{{classname}}> public partial class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}}IEquatable<{{classname}}>
{ {{#vars}}{{#isEnum}}{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}{{>enumClass}}{{/items}}{{/items.isEnum}} {
{{#vars}}
{{#items.isEnum}}
{{#items}}
{{^complexType}}
{{>enumClass}}
{{/complexType}}
{{/items}}
{{/items.isEnum}}
{{#isEnum}}
{{^complexType}}
{{>enumClass}}
{{/complexType}}
{{/isEnum}}
/// <summary> /// <summary>
/// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
/// </summary> /// </summary>
@ -34,6 +47,7 @@ namespace {{packageName}}.Models
public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}} public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}
{{/isEnum}} {{/isEnum}}
{{#hasMore}} {{#hasMore}}
{{/hasMore}} {{/hasMore}}
{{/vars}} {{/vars}}

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

@ -18,7 +18,20 @@ namespace {{modelPackage}}
/// </summary> /// </summary>
[DataContract] [DataContract]
public {{#modelClassModifier}}{{modelClassModifier}} {{/modelClassModifier}}class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}}IEquatable<{{classname}}> public {{#modelClassModifier}}{{modelClassModifier}} {{/modelClassModifier}}class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}}IEquatable<{{classname}}>
{ {{#vars}}{{#isEnum}}{{^isModel}}{{>enumClass}}{{/isModel}}{{/isEnum}}{{#items.isEnum}}{{^isModel}}{{#items}}{{>enumClass}}{{/items}}{{/isModel}}{{/items.isEnum}} {
{{#vars}}
{{#items.isEnum}}
{{#items}}
{{^complexType}}
{{>enumClass}}
{{/complexType}}
{{/items}}
{{/items.isEnum}}
{{#isEnum}}
{{^complexType}}
{{>enumClass}}
{{/complexType}}
{{/isEnum}}
/// <summary> /// <summary>
/// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
/// </summary>{{#description}} /// </summary>{{#description}}
@ -37,6 +50,7 @@ namespace {{modelPackage}}
public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}} public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}
{{/isEnum}} {{/isEnum}}
{{#hasMore}} {{#hasMore}}
{{/hasMore}} {{/hasMore}}
{{/vars}} {{/vars}}

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

@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
/// </summary> /// </summary>
[DataContract] [DataContract]
public partial class ApiResponse : IEquatable<ApiResponse> public partial class ApiResponse : IEquatable<ApiResponse>
{ {
/// <summary> /// <summary>
/// Gets or Sets Code /// Gets or Sets Code
/// </summary> /// </summary>

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

@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
/// </summary> /// </summary>
[DataContract] [DataContract]
public partial class Category : IEquatable<Category> public partial class Category : IEquatable<Category>
{ {
/// <summary> /// <summary>
/// Gets or Sets Id /// Gets or Sets Id
/// </summary> /// </summary>

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

@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
/// </summary> /// </summary>
[DataContract] [DataContract]
public partial class Order : IEquatable<Order> public partial class Order : IEquatable<Order>
{ {
/// <summary> /// <summary>
/// Gets or Sets Id /// Gets or Sets Id
/// </summary> /// </summary>
@ -50,6 +50,7 @@ namespace Org.OpenAPITools.Models
[DataMember(Name="shipDate", EmitDefaultValue=false)] [DataMember(Name="shipDate", EmitDefaultValue=false)]
public DateTime ShipDate { get; set; } public DateTime ShipDate { get; set; }
/// <summary> /// <summary>
/// Order Status /// Order Status
/// </summary> /// </summary>

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

@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
/// </summary> /// </summary>
[DataContract] [DataContract]
public partial class Pet : IEquatable<Pet> public partial class Pet : IEquatable<Pet>
{ {
/// <summary> /// <summary>
/// Gets or Sets Id /// Gets or Sets Id
/// </summary> /// </summary>
@ -58,6 +58,7 @@ namespace Org.OpenAPITools.Models
[DataMember(Name="tags", EmitDefaultValue=false)] [DataMember(Name="tags", EmitDefaultValue=false)]
public List<Tag> Tags { get; set; } public List<Tag> Tags { get; set; }
/// <summary> /// <summary>
/// pet status in the store /// pet status in the store
/// </summary> /// </summary>

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

@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
/// </summary> /// </summary>
[DataContract] [DataContract]
public partial class Tag : IEquatable<Tag> public partial class Tag : IEquatable<Tag>
{ {
/// <summary> /// <summary>
/// Gets or Sets Id /// Gets or Sets Id
/// </summary> /// </summary>

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

@ -25,7 +25,7 @@ namespace Org.OpenAPITools.Models
/// </summary> /// </summary>
[DataContract] [DataContract]
public partial class User : IEquatable<User> public partial class User : IEquatable<User>
{ {
/// <summary> /// <summary>
/// Gets or Sets Id /// Gets or Sets Id
/// </summary> /// </summary>