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

fix: Fixing format exception when parsing JSON DateTime with timezone info

Browse Source
This commit is contained in:
Chris Cameron
2019-04-01 16:47:08 -04:00
parent bcf13ef972
commit f36b9f7856
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ICD.Common.Utils.Tests/Json/JsonUtilsTest.cs
View File

@@ -18,7 +18,11 @@ namespace ICD.Common.Utils.Tests.Json
[Test]
public void ParseDateTimeTest()
{
Assert.Inconclusive();
const string dataA = "2016-02-26T19:24:59";
const string dataB = "2019-04-01T12:41:15-04:00";
Assert.DoesNotThrow(() => JsonUtils.ParseDateTime(dataA));
Assert.DoesNotThrow(() => JsonUtils.ParseDateTime(dataB));
}
[Test]

10
ICD.Common.Utils/Json/JsonUtils.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Globalization;
using System.Linq;
using System.Text;
using ICD.Common.Properties;
@@ -16,9 +15,6 @@ namespace ICD.Common.Utils.Json
[PublicAPI]
public static class JsonUtils
{
// 2016-02-26T19:24:59
private const string DATE_FORMAT = @"yyyy-MM-dd\THH:mm:ss";
private const string MESSAGE_NAME_PROPERTY = "m";
private const string MESSAGE_DATA_PROPERTY = "d";
@@ -29,7 +25,7 @@ namespace ICD.Common.Utils.Json
/// <returns></returns>
public static DateTime ParseDateTime(string data)
{
return DateTime.ParseExact(data, DATE_FORMAT, CultureInfo.CurrentCulture);
return DateTime.Parse(data);
}
/// <summary>
@@ -43,11 +39,7 @@ namespace ICD.Common.Utils.Json
if (token == null)
throw new ArgumentNullException("token");
#if SIMPLSHARP
return ParseDateTime((string)token);
#else
return (DateTime)token;
#endif
}
/// <summary>