Skip to content

[C#][ASP.NET] fix "EmitDefaultValue" default value with false #2558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
Apr 1, 2019
Merged

[C#][ASP.NET] fix "EmitDefaultValue" default value with false #2558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace {{packageName}}.Models
{{#required}}
[Required]
{{/required}}
[DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}{{emitDefaultValue}}{{/isNullable}})]
[DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}})]
{{#isEnum}}
public {{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}?{{/isContainer}}{{/isEnum}} {{name}} { get; set; }
{{/isEnum}}
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace {{packageName}}.Models
{{#required}}
[Required]
{{/required}}
[DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}{{emitDefaultValue}}{{/isNullable}})]
[DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}})]
{{#isEnum}}
public {{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}?{{/isContainer}}{{/isEnum}} {{name}} { get; set; }
{{/isEnum}}
Expand Down
8 changes: 4 additions & 4 deletions samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery][Required()]List<string
// return StatusCode(400);

string exampleJson = null;
exampleJson = "{\r\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\r\n \"name\" : \"doggie\",\r\n \"id\" : 0,\r\n \"category\" : {\r\n \"name\" : \"name\",\r\n \"id\" : 6\r\n },\r\n \"tags\" : [ {\r\n \"name\" : \"name\",\r\n \"id\" : 1\r\n }, {\r\n \"name\" : \"name\",\r\n \"id\" : 1\r\n } ],\r\n \"status\" : \"available\"\r\n}";
exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}";
exampleJson = "<Pet>\n <id>123456789</id>\n <name>doggie</name>\n <photoUrls>\n <photoUrls>aeiou</photoUrls>\n </photoUrls>\n <tags>\n </tags>\n <status>aeiou</status>\n</Pet>";

var example = exampleJson != null
Expand Down Expand Up @@ -114,7 +114,7 @@ public virtual IActionResult FindPetsByTags([FromQuery][Required()]List<string>
// return StatusCode(400);

string exampleJson = null;
exampleJson = "{\r\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\r\n \"name\" : \"doggie\",\r\n \"id\" : 0,\r\n \"category\" : {\r\n \"name\" : \"name\",\r\n \"id\" : 6\r\n },\r\n \"tags\" : [ {\r\n \"name\" : \"name\",\r\n \"id\" : 1\r\n }, {\r\n \"name\" : \"name\",\r\n \"id\" : 1\r\n } ],\r\n \"status\" : \"available\"\r\n}";
exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}";
exampleJson = "<Pet>\n <id>123456789</id>\n <name>doggie</name>\n <photoUrls>\n <photoUrls>aeiou</photoUrls>\n </photoUrls>\n <tags>\n </tags>\n <status>aeiou</status>\n</Pet>";

var example = exampleJson != null
Expand Down Expand Up @@ -149,7 +149,7 @@ public virtual IActionResult GetPetById([FromRoute][Required]long? petId)
// return StatusCode(404);

string exampleJson = null;
exampleJson = "{\r\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\r\n \"name\" : \"doggie\",\r\n \"id\" : 0,\r\n \"category\" : {\r\n \"name\" : \"name\",\r\n \"id\" : 6\r\n },\r\n \"tags\" : [ {\r\n \"name\" : \"name\",\r\n \"id\" : 1\r\n }, {\r\n \"name\" : \"name\",\r\n \"id\" : 1\r\n } ],\r\n \"status\" : \"available\"\r\n}";
exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}";
exampleJson = "<Pet>\n <id>123456789</id>\n <name>doggie</name>\n <photoUrls>\n <photoUrls>aeiou</photoUrls>\n </photoUrls>\n <tags>\n </tags>\n <status>aeiou</status>\n</Pet>";

var example = exampleJson != null
Expand Down Expand Up @@ -223,7 +223,7 @@ public virtual IActionResult UploadFile([FromRoute][Required]long? petId, [FromF
// return StatusCode(200, default(ApiResponse));

string exampleJson = null;
exampleJson = "{\r\n \"code\" : 0,\r\n \"type\" : \"type\",\r\n \"message\" : \"message\"\r\n}";
exampleJson = "{\n \"code\" : 0,\n \"type\" : \"type\",\n \"message\" : \"message\"\n}";

var example = exampleJson != null
? JsonConvert.DeserializeObject<ApiResponse>(exampleJson)
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public virtual IActionResult GetOrderById([FromRoute][Required][Range(1, 5)]long
// return StatusCode(404);

string exampleJson = null;
exampleJson = "{\r\n \"petId\" : 6,\r\n \"quantity\" : 1,\r\n \"id\" : 0,\r\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\r\n \"complete\" : false,\r\n \"status\" : \"placed\"\r\n}";
exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}";
exampleJson = "<Order>\n <id>123456789</id>\n <petId>123456789</petId>\n <quantity>123</quantity>\n <shipDate>2000-01-23T04:56:07.000Z</shipDate>\n <status>aeiou</status>\n <complete>true</complete>\n</Order>";

var example = exampleJson != null
Expand Down Expand Up @@ -127,7 +127,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order body)
// return StatusCode(400);

string exampleJson = null;
exampleJson = "{\r\n \"petId\" : 6,\r\n \"quantity\" : 1,\r\n \"id\" : 0,\r\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\r\n \"complete\" : false,\r\n \"status\" : \"placed\"\r\n}";
exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}";
exampleJson = "<Order>\n <id>123456789</id>\n <petId>123456789</petId>\n <quantity>123</quantity>\n <shipDate>2000-01-23T04:56:07.000Z</shipDate>\n <status>aeiou</status>\n <complete>true</complete>\n</Order>";

var example = exampleJson != null
Expand Down
2 changes: 1 addition & 1 deletion samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public virtual IActionResult GetUserByName([FromRoute][Required]string username)
// return StatusCode(404);

string exampleJson = null;
exampleJson = "{\r\n \"firstName\" : \"firstName\",\r\n \"lastName\" : \"lastName\",\r\n \"password\" : \"password\",\r\n \"userStatus\" : 6,\r\n \"phone\" : \"phone\",\r\n \"id\" : 0,\r\n \"email\" : \"email\",\r\n \"username\" : \"username\"\r\n}";
exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}";
exampleJson = "<User>\n <id>123456789</id>\n <username>aeiou</username>\n <firstName>aeiou</firstName>\n <lastName>aeiou</lastName>\n <email>aeiou</email>\n <password>aeiou</password>\n <phone>aeiou</phone>\n <userStatus>123</userStatus>\n</User>";

var example = exampleJson != null
Expand Down
6 changes: 3 additions & 3 deletions samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ public partial class ApiResponse : IEquatable<ApiResponse>
/// <summary>
/// Gets or Sets Code
/// </summary>
[DataMember(Name="code")]
[DataMember(Name="code", EmitDefaultValue=false)]
public int? Code { get; set; }

/// <summary>
/// Gets or Sets Type
/// </summary>
[DataMember(Name="type")]
[DataMember(Name="type", EmitDefaultValue=false)]
public string Type { get; set; }

/// <summary>
/// Gets or Sets Message
/// </summary>
[DataMember(Name="message")]
[DataMember(Name="message", EmitDefaultValue=false)]
public string Message { get; set; }

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ public partial class Category : IEquatable<Category>
/// <summary>
/// Gets or Sets Id
/// </summary>
[DataMember(Name="id")]
[DataMember(Name="id", EmitDefaultValue=false)]
public long? Id { get; set; }

/// <summary>
/// Gets or Sets Name
/// </summary>
[DataMember(Name="name")]
[DataMember(Name="name", EmitDefaultValue=false)]
public string Name { get; set; }

/// <summary>
Expand Down
12 changes: 6 additions & 6 deletions samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@ public partial class Order : IEquatable<Order>
/// <summary>
/// Gets or Sets Id
/// </summary>
[DataMember(Name="id")]
[DataMember(Name="id", EmitDefaultValue=false)]
public long? Id { get; set; }

/// <summary>
/// Gets or Sets PetId
/// </summary>
[DataMember(Name="petId")]
[DataMember(Name="petId", EmitDefaultValue=false)]
public long? PetId { get; set; }

/// <summary>
/// Gets or Sets Quantity
/// </summary>
[DataMember(Name="quantity")]
[DataMember(Name="quantity", EmitDefaultValue=false)]
public int? Quantity { get; set; }

/// <summary>
/// Gets or Sets ShipDate
/// </summary>
[DataMember(Name="shipDate")]
[DataMember(Name="shipDate", EmitDefaultValue=false)]
public DateTime? ShipDate { get; set; }

/// <summary>
Expand Down Expand Up @@ -79,13 +79,13 @@ public enum StatusEnum
/// Order Status
/// </summary>
/// <value>Order Status</value>
[DataMember(Name="status")]
[DataMember(Name="status", EmitDefaultValue=false)]
public StatusEnum? Status { get; set; }

/// <summary>
/// Gets or Sets Complete
/// </summary>
[DataMember(Name="complete")]
[DataMember(Name="complete", EmitDefaultValue=false)]
public bool? Complete { get; set; }

/// <summary>
Expand Down
12 changes: 6 additions & 6 deletions samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,33 @@ public partial class Pet : IEquatable<Pet>
/// <summary>
/// Gets or Sets Id
/// </summary>
[DataMember(Name="id")]
[DataMember(Name="id", EmitDefaultValue=false)]
public long? Id { get; set; }

/// <summary>
/// Gets or Sets Category
/// </summary>
[DataMember(Name="category")]
[DataMember(Name="category", EmitDefaultValue=false)]
public Category Category { get; set; }

/// <summary>
/// Gets or Sets Name
/// </summary>
[Required]
[DataMember(Name="name")]
[DataMember(Name="name", EmitDefaultValue=false)]
public string Name { get; set; }

/// <summary>
/// Gets or Sets PhotoUrls
/// </summary>
[Required]
[DataMember(Name="photoUrls")]
[DataMember(Name="photoUrls", EmitDefaultValue=false)]
public List<string> PhotoUrls { get; set; }

/// <summary>
/// Gets or Sets Tags
/// </summary>
[DataMember(Name="tags")]
[DataMember(Name="tags", EmitDefaultValue=false)]
public List<Tag> Tags { get; set; }

/// <summary>
Expand Down Expand Up @@ -87,7 +87,7 @@ public enum StatusEnum
/// pet status in the store
/// </summary>
/// <value>pet status in the store</value>
[DataMember(Name="status")]
[DataMember(Name="status", EmitDefaultValue=false)]
public StatusEnum? Status { get; set; }

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ public partial class Tag : IEquatable<Tag>
/// <summary>
/// Gets or Sets Id
/// </summary>
[DataMember(Name="id")]
[DataMember(Name="id", EmitDefaultValue=false)]
public long? Id { get; set; }

/// <summary>
/// Gets or Sets Name
/// </summary>
[DataMember(Name="name")]
[DataMember(Name="name", EmitDefaultValue=false)]
public string Name { get; set; }

/// <summary>
Expand Down
16 changes: 8 additions & 8 deletions samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,50 +27,50 @@ public partial class User : IEquatable<User>
/// <summary>
/// Gets or Sets Id
/// </summary>
[DataMember(Name="id")]
[DataMember(Name="id", EmitDefaultValue=false)]
public long? Id { get; set; }

/// <summary>
/// Gets or Sets Username
/// </summary>
[DataMember(Name="username")]
[DataMember(Name="username", EmitDefaultValue=false)]
public string Username { get; set; }

/// <summary>
/// Gets or Sets FirstName
/// </summary>
[DataMember(Name="firstName")]
[DataMember(Name="firstName", EmitDefaultValue=false)]
public string FirstName { get; set; }

/// <summary>
/// Gets or Sets LastName
/// </summary>
[DataMember(Name="lastName")]
[DataMember(Name="lastName", EmitDefaultValue=false)]
public string LastName { get; set; }

/// <summary>
/// Gets or Sets Email
/// </summary>
[DataMember(Name="email")]
[DataMember(Name="email", EmitDefaultValue=false)]
public string Email { get; set; }

/// <summary>
/// Gets or Sets Password
/// </summary>
[DataMember(Name="password")]
[DataMember(Name="password", EmitDefaultValue=false)]
public string Password { get; set; }

/// <summary>
/// Gets or Sets Phone
/// </summary>
[DataMember(Name="phone")]
[DataMember(Name="phone", EmitDefaultValue=false)]
public string Phone { get; set; }

/// <summary>
/// User Status
/// </summary>
/// <value>User Status</value>
[DataMember(Name="userStatus")]
[DataMember(Name="userStatus", EmitDefaultValue=false)]
public int? UserStatus { get; set; }

/// <summary>
Expand Down