Skip to content

Commit bae9226

Browse files
wing328wing328
committed
Merge branch 'fix_issue18541' of https://github.com/jpduchon/openapi-generator into jpduchon-fix_issue18541
2 parents 9919c23 + 319b3cc commit bae9226

File tree

9 files changed

+2
-14
lines changed

9 files changed

+2
-14
lines changed

‎modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache

+2
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,9 @@
219219
{{^conditionalSerialization}}
220220
[DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#required}}true{{/required}}{{^required}}{{#isBoolean}}true{{/isBoolean}}{{^isBoolean}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/isBoolean}}{{/required}}{{/vendorExtensions.x-emit-default-value}})]
221221
{{#isDate}}
222+
{{^supportsDateOnly}}
222223
[JsonConverter(typeof(OpenAPIDateConverter))]
224+
{{/supportsDateOnly}}
223225
{{/isDate}}
224226
{{#deprecated}}
225227
[Obsolete]

‎samples/client/petstore/csharp/restsharp/net7/EnumMappings/src/Org.OpenAPITools/Model/DateOnlyClass.cs

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public partial class DateOnlyClass : IEquatable<DateOnlyClass>, IValidatableObje
4747
/// </summary>
4848
/// <example>Fri Jul 21 00:00:00 UTC 2017</example>
4949
[DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)]
50-
[JsonConverter(typeof(OpenAPIDateConverter))]
5150
public DateOnly DateOnlyProperty { get; set; }
5251

5352
/// <summary>

‎samples/client/petstore/csharp/restsharp/net7/EnumMappings/src/Org.OpenAPITools/Model/FormatTest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ protected FormatTest()
178178
/// </summary>
179179
/// <example>Sun Feb 02 00:00:00 UTC 2020</example>
180180
[DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)]
181-
[JsonConverter(typeof(OpenAPIDateConverter))]
182181
public DateOnly Date { get; set; }
183182

184183
/// <summary>

‎samples/client/petstore/csharp/restsharp/net7/EnumMappings/src/Org.OpenAPITools/Model/NullableClass.cs

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ public partial class NullableClass : IEquatable<NullableClass>, IValidatableObje
9292
/// Gets or Sets DateProp
9393
/// </summary>
9494
[DataMember(Name = "date_prop", EmitDefaultValue = true)]
95-
[JsonConverter(typeof(OpenAPIDateConverter))]
9695
public DateOnly DateProp { get; set; }
9796

9897
/// <summary>

‎samples/client/petstore/csharp/restsharp/net7/EnumMappings/src/Org.OpenAPITools/Model/RequiredClass.cs

-4
Original file line numberDiff line numberDiff line change
@@ -708,28 +708,24 @@ protected RequiredClass()
708708
/// Gets or Sets RequiredNullableDateProp
709709
/// </summary>
710710
[DataMember(Name = "required_nullable_date_prop", IsRequired = true, EmitDefaultValue = true)]
711-
[JsonConverter(typeof(OpenAPIDateConverter))]
712711
public DateOnly RequiredNullableDateProp { get; set; }
713712

714713
/// <summary>
715714
/// Gets or Sets RequiredNotNullableDateProp
716715
/// </summary>
717716
[DataMember(Name = "required_not_nullable_date_prop", IsRequired = true, EmitDefaultValue = true)]
718-
[JsonConverter(typeof(OpenAPIDateConverter))]
719717
public DateOnly RequiredNotNullableDateProp { get; set; }
720718

721719
/// <summary>
722720
/// Gets or Sets NotRequiredNullableDateProp
723721
/// </summary>
724722
[DataMember(Name = "not_required_nullable_date_prop", EmitDefaultValue = true)]
725-
[JsonConverter(typeof(OpenAPIDateConverter))]
726723
public DateOnly NotRequiredNullableDateProp { get; set; }
727724

728725
/// <summary>
729726
/// Gets or Sets NotRequiredNotnullableDateProp
730727
/// </summary>
731728
[DataMember(Name = "not_required_notnullable_date_prop", EmitDefaultValue = false)]
732-
[JsonConverter(typeof(OpenAPIDateConverter))]
733729
public DateOnly NotRequiredNotnullableDateProp { get; set; }
734730

735731
/// <summary>

‎samples/client/petstore/csharp/restsharp/net7/Petstore/src/Org.OpenAPITools/Model/DateOnlyClass.cs

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public partial class DateOnlyClass : IEquatable<DateOnlyClass>, IValidatableObje
4646
/// </summary>
4747
/// <example>Fri Jul 21 00:00:00 UTC 2017</example>
4848
[DataMember(Name = "dateOnlyProperty", EmitDefaultValue = false)]
49-
[JsonConverter(typeof(OpenAPIDateConverter))]
5049
public DateOnly DateOnlyProperty { get; set; }
5150

5251
/// <summary>

‎samples/client/petstore/csharp/restsharp/net7/Petstore/src/Org.OpenAPITools/Model/FormatTest.cs

-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ protected FormatTest() { }
174174
/// </summary>
175175
/// <example>Sun Feb 02 00:00:00 UTC 2020</example>
176176
[DataMember(Name = "date", IsRequired = true, EmitDefaultValue = true)]
177-
[JsonConverter(typeof(OpenAPIDateConverter))]
178177
public DateOnly Date { get; set; }
179178

180179
/// <summary>

‎samples/client/petstore/csharp/restsharp/net7/Petstore/src/Org.OpenAPITools/Model/NullableClass.cs

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ public partial class NullableClass : IEquatable<NullableClass>, IValidatableObje
9292
/// Gets or Sets DateProp
9393
/// </summary>
9494
[DataMember(Name = "date_prop", EmitDefaultValue = true)]
95-
[JsonConverter(typeof(OpenAPIDateConverter))]
9695
public DateOnly DateProp { get; set; }
9796

9897
/// <summary>

‎samples/client/petstore/csharp/restsharp/net7/Petstore/src/Org.OpenAPITools/Model/RequiredClass.cs

-4
Original file line numberDiff line numberDiff line change
@@ -704,28 +704,24 @@ protected RequiredClass() { }
704704
/// Gets or Sets RequiredNullableDateProp
705705
/// </summary>
706706
[DataMember(Name = "required_nullable_date_prop", IsRequired = true, EmitDefaultValue = true)]
707-
[JsonConverter(typeof(OpenAPIDateConverter))]
708707
public DateOnly RequiredNullableDateProp { get; set; }
709708

710709
/// <summary>
711710
/// Gets or Sets RequiredNotNullableDateProp
712711
/// </summary>
713712
[DataMember(Name = "required_not_nullable_date_prop", IsRequired = true, EmitDefaultValue = true)]
714-
[JsonConverter(typeof(OpenAPIDateConverter))]
715713
public DateOnly RequiredNotNullableDateProp { get; set; }
716714

717715
/// <summary>
718716
/// Gets or Sets NotRequiredNullableDateProp
719717
/// </summary>
720718
[DataMember(Name = "not_required_nullable_date_prop", EmitDefaultValue = true)]
721-
[JsonConverter(typeof(OpenAPIDateConverter))]
722719
public DateOnly NotRequiredNullableDateProp { get; set; }
723720

724721
/// <summary>
725722
/// Gets or Sets NotRequiredNotnullableDateProp
726723
/// </summary>
727724
[DataMember(Name = "not_required_notnullable_date_prop", EmitDefaultValue = false)]
728-
[JsonConverter(typeof(OpenAPIDateConverter))]
729725
public DateOnly NotRequiredNotnullableDateProp { get; set; }
730726

731727
/// <summary>

0 commit comments

Comments
 (0)