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

Option to force DateTimes to deserialize as Utc #28

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Option to force DateTimes to deserialize as Utc #28

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
16 changes: 15 additions & 1 deletion src/LitJson/JsonMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,19 @@ internal struct ObjectMetadata
public delegate IJsonWrapper WrapperFactory ();


[Flags]
public enum JsonMapperOptions
{
None = 0x00,
DateTimesAlwaysUniversal = 0x01,
}


public class JsonMapper
{
#region Fields
public static JsonMapperOptions Options;

private static int max_nesting_depth;

private static IFormatProvider datetime_format;
Expand Down Expand Up @@ -667,7 +677,11 @@ private static void RegisterBaseImporters ()
typeof (char), importer);

importer = delegate (object input) {
return Convert.ToDateTime ((string) input, datetime_format);
DateTime result = Convert.ToDateTime((string) input, datetime_format);
if ((JsonMapper.Options & JsonMapperOptions.DateTimesAlwaysUniversal) != 0) {
result = result.ToUniversalTime();
}
return result;
};
RegisterImporter (base_importers_table, typeof (string),
typeof (DateTime), importer);
Expand Down
27 changes: 27 additions & 0 deletions test/JsonMapperTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ public enum NullableEnum
TestVal2 = 2
}

public class DateTimeTest
{
public DateTime dateTimeValue;
}

public class NullableEnumTest
{
public NullableEnum? TestEnum;
Expand Down Expand Up @@ -1024,5 +1029,27 @@ public void NullableEnumExportTest()
expectedJson = "{\"TestEnum\":null}";
Assert.AreEqual(expectedJson, JsonMapper.ToJson(value));
}

[Test]
public void DateTimeShouldBeUniversalTest()
{
string json = @"{
""dateTimeValue"": ""2014-05-02T05:52:10.569000+00:00""
}";

JsonMapper.Options = JsonMapperOptions.DateTimesAlwaysUniversal;

DateTimeTest dateTimeTest = JsonMapper.ToObject<DateTimeTest>(json);
Assert.AreEqual(DateTimeKind.Utc, dateTimeTest.dateTimeValue.Kind);

json = @"{
""dateTimeValue"": ""2014-05-02T05:52:10.569000""
}";

dateTimeTest = JsonMapper.ToObject<DateTimeTest>(json);
Assert.AreEqual(DateTimeKind.Utc, dateTimeTest.dateTimeValue.Kind);

JsonMapper.Options = JsonMapperOptions.None;
}
}
}