Merge pull request #129 from ActiveCampaign/systemtextjson

Migrate to System.Text.Json

src/Postmark.Tests/ClientBaseFixture.cs

@@ -2,10 +2,10 @@
 using PostmarkDotNet;
 using System;
 using System.IO;
-using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Linq;
+using System.Text.Json;
 
 namespace Postmark.Tests
 {
@@ -58,7 +58,7 @@ private static string ConfigVariable(string variableName)
                     componentsCount--;
                 }
 
-                var values = JsonConvert.DeserializeObject<Dictionary<String, String>>(File.ReadAllText(keyPath));
+                var values = JsonSerializer.Deserialize<Dictionary<String, String>>(File.ReadAllText(keyPath));
                 retval = values[variableName];
             }
             catch

src/Postmark.Tests/ClientWebhookTests.cs

@@ -42,7 +42,6 @@ public async Task ClientCanCreateConfiguration()
                 Delivery = new WebhookConfigurationDeliveryTrigger {Enabled = true},
                 SpamComplaint = new WebhookConfigurationSpamComplaintTrigger {Enabled = true, IncludeContent = true},
                 SubscriptionChange = new WebhookConfigurationSubscriptionChangeTrigger {Enabled = true},
-
             };
             var newConfiguration = await Client.CreateWebhookConfigurationAsync(url, messageStream, httpAuth, httpHeaders, triggers);
 

src/Postmark/Converters/DateTimeConverter.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace PostmarkDotNet.Converters
+{
+    public class DateTimeConverter : JsonConverter<DateTime>
+    {
+        public override bool CanConvert(Type typeToConvert)
+        {
+            return typeToConvert == typeof(DateTime);
+        }
+
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return DateTime.Parse(reader.GetString());
+        }
+
+        public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value.ToString("O"));
+        }
+    }
+}

src/Postmark/Converters/JsonNetExtensions.cs → src/Postmark/Converters/JsonExtensions.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace PostmarkDotNet.Converters
 {
-    internal static class JsonNetExtensions
+    internal static class JsonExtensions
     {
         /// <summary>
         /// Attempt to deserialize a string to the specified type.
@@ -17,15 +17,14 @@ internal static bool TryDeserializeObject<T>(string json, out T result)
             result = default(T);
             try
             {
-                var settings = new JsonSerializerSettings()
-               {
-                   MissingMemberHandling = MissingMemberHandling.Ignore,
-                   NullValueHandling = NullValueHandling.Include,
-                   DefaultValueHandling = DefaultValueHandling.Include
-               };
-
-                settings.Converters.Add(new UnicodeJsonStringConverter());
-                result = JsonConvert.DeserializeObject<T>(json);
+                result = JsonSerializer.Deserialize<T>(json, new JsonSerializerOptions
+                {
+                    Converters =
+                    {
+                        new UnicodeJsonStringConverter(),
+                        new DateTimeConverter()
+                    }
+                });
                 retval = true;
             }
             catch