Merge pull request #150 from manuc66/feature/DateTime_issue_with_1.8.…

…0_#120_ Should fix DateTime issue with 1.8.0
manuc66 · Oct 18, 2022 · 6ea8df4 · 6ea8df4
2 parents 87abcbf + 5456006
commit 6ea8df4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/JsonSubTypes.Tests/DatesTests.cs b/JsonSubTypes.Tests/DatesTests.cs
@@ -17,20 +17,26 @@ public class SubTypeClass : MainClass
         {
             public string Discriminator => "SubTypeClass";
 
-            public DateTimeOffset? Date { get; set; }
+            public DateTimeOffset? DateTimeOffset { get; set; }
+            public DateTime? DateTime { get; set; }
         }
 
         [Test]
         public void DeserializingSubTypeWithDateParsesCorrectly()
         {
-            var json = "{ \"Discriminator\": \"SubTypeClass\", \"Date\": \"2020-06-28T00:00:00.00000+00:00\" }";
+            var json = "{ \"Discriminator\": \"SubTypeClass\", \"DateTime\": \"2020-06-28T00:00:00.00000+00:00\", \"DateTimeOffset\": \"2020-06-28T00:00:00.00000+00:00\" }";
 
-            var obj = JsonConvert.DeserializeObject<MainClass>(json);
+            var obj = JsonConvert.DeserializeObject<MainClass>(json, new JsonSerializerSettings
+            {
+                DateParseHandling = DateParseHandling.DateTimeOffset
+            });
 
             Assert.That(obj, Is.Not.Null);
             Assert.That(obj, Is.InstanceOf<SubTypeClass>());
-            Assert.That(((SubTypeClass)obj).Date.HasValue, Is.True);
-            Assert.That(((SubTypeClass)obj).Date.Value.Offset, Is.EqualTo(TimeSpan.Zero));
+            Assert.That(((SubTypeClass)obj).DateTimeOffset.HasValue, Is.True);
+            Assert.That(((SubTypeClass)obj).DateTimeOffset.Value.Offset, Is.EqualTo(TimeSpan.Zero));
+            Assert.That(((SubTypeClass)obj).DateTime.HasValue, Is.True);
+            Assert.That(((SubTypeClass)obj).DateTime.Value, Is.EqualTo(new DateTime(2020,6,28,0,0,0,0)));
         }
     }
 }
diff --git a/JsonSubTypes/JsonSubtypes.cs b/JsonSubTypes/JsonSubtypes.cs
@@ -214,12 +214,7 @@ private static Type GetElementType(Type arrayOrGenericContainer)
 
         private object ReadObject(JsonReader reader, Type objectType, JsonSerializer serializer)
         {
-            // I would prefer to create a new reader, but can't work out how to
-            // This seems a reasonable alternative - https://github.com/JamesNK/Newtonsoft.Json/issues/1605#issuecomment-602673364
-            var savedDateParseSettings = reader.DateParseHandling;
-            reader.DateParseHandling = DateParseHandling.None;
             var jObject = JObject.Load(reader);
-            reader.DateParseHandling = savedDateParseSettings;
 
             var targetType = GetType(jObject, objectType, serializer) ?? objectType;