Skip to content
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

Jump to bottom

Fix DateFormatConverter System.Text.Json to respect DateType setting #1527

Merged
merged 1 commit into from
Jun 9, 2022
Merged

Fix DateFormatConverter System.Text.Json to respect DateType setting #1527

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
4 changes: 2 additions & 2 deletions src/NJsonSchema.CodeGeneration.CSharp.Tests/GeneralGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,7 +1614,7 @@ public async Task When_definition_contains_date_and_use_system_text_json_then_co
var code = generator.GenerateFile("MyClass");

//// Assert
Assert.Contains(@"class DateFormatConverter", code);
Assert.Contains(@"class DateFormatConverter : System.Text.Json.Serialization.JsonConverter<System.DateTime>", code);
Assert.Contains(@"[System.Text.Json.Serialization.JsonConverter(typeof(DateFormatConverter))]", code);

AssertCompile(code);
Expand Down Expand Up @@ -1791,7 +1791,7 @@ public async Task When_definition_contains_date_and_use_system_text_json_then_co
var code = generator.GenerateFile("MyClass");

//// Assert
Assert.Contains(@"class DateFormatConverter", code);
Assert.Contains(@"class DateFormatConverter : System.Text.Json.Serialization.JsonConverter<System.DateTimeOffset>", code);
Assert.Contains(@"[System.Text.Json.Serialization.JsonConverter(typeof(DateFormatConverter))]", code);

AssertCompile(code);
Expand Down
3 changes: 3 additions & 0 deletions src/NJsonSchema.CodeGeneration.CSharp/Models/DateFormatConverterTemplateModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,8 @@ public DateFormatConverterTemplateModel(CSharpGeneratorSettings settings)

/// <summary>Gets a value indicating whether to use System.Text.Json</summary>
public bool UseSystemTextJson => _settings.JsonLibrary == CSharpJsonLibrary.SystemTextJson;

/// <summary>Gets the date .NET type.</summary>
public string DateType => _settings.DateType;
}
}
8 changes: 4 additions & 4 deletions src/NJsonSchema.CodeGeneration.CSharp/Templates/DateFormatConverter.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "{{ ToolchainVersion }}")]
{%- if UseSystemTextJson -%}
internal class DateFormatConverter : System.Text.Json.Serialization.JsonConverter<System.DateTime>
internal class DateFormatConverter : System.Text.Json.Serialization.JsonConverter<{{ DateType }}>
{
public override System.DateTime Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
public override {{ DateType }} Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
{
var dateTime = reader.GetString();
if (dateTime == null)
{
throw new System.Text.Json.JsonException("Unexpected JsonTokenType.Null");
}

return System.DateTime.Parse(dateTime);
return {{ DateType }}.Parse(dateTime);
}

public override void Write(System.Text.Json.Utf8JsonWriter writer, System.DateTime value, System.Text.Json.JsonSerializerOptions options)
public override void Write(System.Text.Json.Utf8JsonWriter writer, {{ DateType }} value, System.Text.Json.JsonSerializerOptions options)
{
writer.WriteStringValue(value.ToString("yyyy-MM-dd"));
}
Expand Down