Skip to content

[C#] Fixed valuetype parameters and discriminator deserialization #5680

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 9 commits into from
Apr 29, 2020
Merged

[C#] Fixed valuetype parameters and discriminator deserialization #5680

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
35e1e99
Fixed valuetype parameters and discriminator deserialization
gbrown-ce Mar 23, 2020
3afe020
Ran pet store sample script
gbrown-ce Mar 23, 2020
c735e51
Ensure that readWriteVars and readOnlyVars are also marked as isEnum …
gbrown-ce Mar 30, 2020
2f614f0
Updated petstore sample with enum fix
gbrown-ce Mar 30, 2020
5727fab
Fields that are required should emit default values (otherwise the co…
gbrown-ce Apr 2, 2020
ecabacf
Added missing sample updated
gbrown-ce Apr 23, 2020
722342a
Re-ran petstore example script to grab all changes
gbrown-ce Apr 24, 2020
cda3886
Rebased and re-ran example update script
gbrown-ce Apr 24, 2020
635d176
update csharp samples
wing328 Apr 27, 2020
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
Prev Previous commit
Next Next commit
Fields that are required should emit default values (otherwise the co… 
…nsuming API might throw a fit
  • Loading branch information
@gbrown-ce
gbrown-ce committed Apr 24, 2020
commit 5727fab6a6f6337c5e1ab9bd75ba8d33d906b1d9
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{{#description}}
/// <value>{{description}}</value>
{{/description}}
[DataMember(Name="{{baseName}}", EmitDefaultValue={{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})]
[DataMember(Name="{{baseName}}", EmitDefaultValue={{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#required}}true{{/required}}{{^required}}false{{/required}}{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})]
public {{#complexType}}{{{complexType}}}{{/complexType}}{{^complexType}}{{{datatypeWithEnum}}}{{/complexType}}{{^isContainer}}{{^required}}?{{/required}}{{/isContainer}} {{name}} { get; set; }
{{/isEnum}}
{{/vars}}
Expand Down Expand Up @@ -108,7 +108,7 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}};
/// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
/// </summary>{{#description}}
/// <value>{{description}}</value>{{/description}}
[DataMember(Name="{{baseName}}", EmitDefaultValue={{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})]{{#isDate}}
[DataMember(Name="{{baseName}}", EmitDefaultValue={{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#required}}true{{/required}}{{^required}}false{{/required}}{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})]{{#isDate}}
[JsonConverter(typeof(OpenAPIDateConverter))]{{/isDate}}
public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }
{{/isEnum}}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Animal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected Animal() { }
/// <summary>
/// Gets or Sets ClassName
/// </summary>
[DataMember(Name="className", EmitDefaultValue=false)]
[DataMember(Name="className", EmitDefaultValue=true)]
public string ClassName { get; set; }

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Category.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected Category() { }
/// <summary>
/// Gets or Sets Name
/// </summary>
[DataMember(Name="name", EmitDefaultValue=false)]
[DataMember(Name="name", EmitDefaultValue=true)]
public string Name { get; set; }

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public enum EnumStringRequiredEnum
/// <summary>
/// Gets or Sets EnumStringRequired
/// </summary>
[DataMember(Name="enum_string_required", EmitDefaultValue=false)]
[DataMember(Name="enum_string_required", EmitDefaultValue=true)]
public EnumStringRequiredEnum EnumStringRequired { get; set; }
/// <summary>
/// Defines EnumInteger
Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/FormatTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ protected FormatTest() { }
/// <summary>
/// Gets or Sets Number
/// </summary>
[DataMember(Name="number", EmitDefaultValue=false)]
[DataMember(Name="number", EmitDefaultValue=true)]
public decimal Number { get; set; }

/// <summary>
Expand All @@ -151,7 +151,7 @@ protected FormatTest() { }
/// <summary>
/// Gets or Sets Byte
/// </summary>
[DataMember(Name="byte", EmitDefaultValue=false)]
[DataMember(Name="byte", EmitDefaultValue=true)]
public byte[] Byte { get; set; }

/// <summary>
Expand All @@ -163,7 +163,7 @@ protected FormatTest() { }
/// <summary>
/// Gets or Sets Date
/// </summary>
[DataMember(Name="date", EmitDefaultValue=false)]
[DataMember(Name="date", EmitDefaultValue=true)]
[JsonConverter(typeof(OpenAPIDateConverter))]
public DateTime Date { get; set; }

Expand All @@ -182,7 +182,7 @@ protected FormatTest() { }
/// <summary>
/// Gets or Sets Password
/// </summary>
[DataMember(Name="password", EmitDefaultValue=false)]
[DataMember(Name="password", EmitDefaultValue=true)]
public string Password { get; set; }

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Name.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protected Name() { }
/// <summary>
/// Gets or Sets _Name
/// </summary>
[DataMember(Name="name", EmitDefaultValue=false)]
[DataMember(Name="name", EmitDefaultValue=true)]
public int _Name { get; set; }

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/Pet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ protected Pet() { }
/// <summary>
/// Gets or Sets Name
/// </summary>
[DataMember(Name="name", EmitDefaultValue=false)]
[DataMember(Name="name", EmitDefaultValue=true)]
public string Name { get; set; }

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

/// <summary>
Expand Down
10 changes: 5 additions & 5 deletions samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TypeHolderDefault.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,31 +100,31 @@ protected TypeHolderDefault() { }
/// <summary>
/// Gets or Sets StringItem
/// </summary>
[DataMember(Name="string_item", EmitDefaultValue=false)]
[DataMember(Name="string_item", EmitDefaultValue=true)]
public string StringItem { get; set; }

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

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

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

/// <summary>
/// Gets or Sets ArrayItem
/// </summary>
[DataMember(Name="array_item", EmitDefaultValue=false)]
[DataMember(Name="array_item", EmitDefaultValue=true)]
public List<int> ArrayItem { get; set; }

/// <summary>
Expand Down
12 changes: 6 additions & 6 deletions samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/TypeHolderExample.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,37 +111,37 @@ protected TypeHolderExample() { }
/// <summary>
/// Gets or Sets StringItem
/// </summary>
[DataMember(Name="string_item", EmitDefaultValue=false)]
[DataMember(Name="string_item", EmitDefaultValue=true)]
public string StringItem { get; set; }

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

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

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

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

/// <summary>
/// Gets or Sets ArrayItem
/// </summary>
[DataMember(Name="array_item", EmitDefaultValue=false)]
[DataMember(Name="array_item", EmitDefaultValue=true)]
public List<int> ArrayItem { get; set; }

/// <summary>
Expand Down