icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-01-11 19:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Another round of JSON DateTime fixes

Browse Source
This commit is contained in:
Chris Cameron
2020-05-27 19:38:04 -04:00
parent 6240d3fccf
commit 25fb5a0ad8
3 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ICD.Common.Utils.Tests/Json/DateTimeIsoConverterTest.cs Normal file
View File

@@ -0,0 +1,41 @@
using System;
using ICD.Common.Utils.Json;
using Newtonsoft.Json;
using NUnit.Framework;
namespace ICD.Common.Utils.Tests.Json
{
[TestFixture]
public sealed class DateTimeIsoConverterTest : AbstractGenericJsonConverterTest
{
[Test]
public override void WriteJsonTest()
{
JsonSerializerSettings settings = new JsonSerializerSettings
{
DateParseHandling = DateParseHandling.None
};
settings.Converters.Add(new DateTimeIsoConverter());
DateTime dateTime = new DateTime(2020, 1, 2, 3, 4, 5, DateTimeKind.Utc);
string serial = JsonConvert.SerializeObject(dateTime, settings);
Assert.AreEqual("\"2020-01-02T03:04:05Z\"", serial);
}
[Test]
public override void ReadJsonTest()
{
JsonSerializerSettings settings = new JsonSerializerSettings
{
DateParseHandling = DateParseHandling.None
};
settings.Converters.Add(new DateTimeIsoConverter());
string serial = "\"2020-01-02T03:04:05Z\"";
DateTime dateTime = JsonConvert.DeserializeObject<DateTime>(serial, settings);
Assert.AreEqual(new DateTime(2020, 1, 2, 3, 4, 5, DateTimeKind.Utc), dateTime);
}
}
}

3
ICD.Common.Utils/Extensions/JsonReaderExtensions.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Globalization;
using ICD.Common.Properties;
using Newtonsoft.Json;
@@ -272,7 +273,7 @@ namespace ICD.Common.Utils.Extensions
#endif
string stringValue = extends.GetValueAsString();
return DateTime.Parse(stringValue);
return DateTime.Parse(stringValue, null, DateTimeStyles.RoundtripKind);
}
/// <summary>

13
ICD.Common.Utils/Json/DateTimeIsoConverter.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Globalization;
using System.Text.RegularExpressions;
using ICD.Common.Utils.Extensions;
using Newtonsoft.Json;
@@ -15,7 +16,12 @@ namespace ICD.Common.Utils.Json
/// <param name="serializer">The calling serializer.</param>
public override void WriteJson(JsonWriter writer, DateTime value, JsonSerializer serializer)
{
writer.WriteValue(value.ToIso());
string iso = value.ToIso();
// Remove redundant ms
iso = iso.Replace(".0000000", "");
writer.WriteValue(iso);
}
/// <summary>
@@ -48,11 +54,10 @@ namespace ICD.Common.Utils.Json
// No TimeZoneInfo in CF, so now things get gross
dateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Unspecified);
string iso = dateTime.ToIso() + match.Groups["zone"].Value;
return DateTime.Parse(iso);
serial = dateTime.ToIso() + match.Groups["zone"].Value;
}
return DateTime.Parse(serial);
return DateTime.Parse(serial, null, DateTimeStyles.RoundtripKind);
}
}
}