Skip to content

System.Text.Json: Add TimeSpanConverter #54186

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
layomia merged 11 commits into from
Jul 7, 2021
Merged

System.Text.Json: Add TimeSpanConverter #54186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9fa6f46
Added TimeSpanConverter.
CodeBlanch Jun 14, 2021
03b10a3
Code review.
CodeBlanch Jun 15, 2021
9c5c1f6
Test tweak.
CodeBlanch Jun 15, 2021
bce438f
Added invalid cases.
CodeBlanch Jun 15, 2021
0293935
Remove the ToArray call in the case of ValueSequence.
CodeBlanch Jun 21, 2021
cf8d104
Support escaped strings in TimeSpanConverter.
CodeBlanch Jun 25, 2021
6041e5c
Merge remote-tracking branch 'upstream/main' into json-timespan2
CodeBlanch Jun 28, 2021
2838c26
Removed 'g' format fallback.
CodeBlanch Jun 28, 2021
0248a15
Fixed 'h:mm:ss' being accepted by TimeSpanConverter.
CodeBlanch Jun 28, 2021
f875e6f
Code review.
CodeBlanch Jul 6, 2021
f3e49ff
Code review.
CodeBlanch Jul 6, 2021
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
Fixed 'h:mm:ss' being accepted by TimeSpanConverter.
  • Loading branch information
@CodeBlanch
CodeBlanch committed Jun 28, 2021
commit 0248a1529654fe99bb029b2a77728a0dbf5f0c6a
2 changes: 1 addition & 1 deletion ...System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/TimeSpanConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace System.Text.Json.Serialization.Converters
{
internal sealed class TimeSpanConverter : JsonConverter<TimeSpan>
{
private const int MinimumTimeSpanFormatLength = 7; // h:mm:ss
private const int MinimumTimeSpanFormatLength = 8; // hh:mm:ss
private const int MaximumTimeSpanFormatLength = 26; // -dddddddd.hh:mm:ss.fffffff
private const int MaximumEscapedTimeSpanFormatLength = JsonConstants.MaxExpansionFactorWhileEscaping * MaximumTimeSpanFormatLength;

Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/Value.ReadTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,6 @@ private static void DeserializeLongJsonString(int stringLength)
[InlineData("\\u0032\\u0033\\u003A\\u0035\\u0039\\u003A\\u0035\\u0039", "23:59:59")]
[InlineData("23:59:59.9", "23:59:59.9000000")]
[InlineData("23:59:59.9999999")]
[InlineData("1:00:00", "01:00:00")] // 'g' Format, allowed by Utf8Parser 'c' parser
[InlineData("9999999.23:59:59.9999999")]
[InlineData("-9999999.23:59:59.9999999")]
[InlineData("10675199.02:48:05.4775807")] // TimeSpan.MaxValue
Expand Down Expand Up @@ -491,7 +490,8 @@ public static void TimeSpan_Read_KnownDifferences()
[InlineData("00:00:60")]
[InlineData("00:00:00.00000009")]
[InlineData("900000000.00:00:00")]
[InlineData("1:2:00:00")] // 'g' Format, disallowed by Utf8Parser 'c' parser
[InlineData("1:00:00")] // 'g' Format
[InlineData("1:2:00:00")] // 'g' Format
[InlineData("+00:00:00")]
[InlineData("2021-06-18")]
[InlineData("1$")]
Expand Down