Refactor to use DockerClient.JsonSerializer settings

Attempt to fix failing test case due to I/O

Author: David García Vives

src/Docker.DotNet/Endpoints/StreamUtil.cs

@@ -11,8 +11,6 @@ namespace Docker.DotNet.Models
 {
     internal static class StreamUtil
     {
-        private static readonly Newtonsoft.Json.JsonSerializer _serializer = new Newtonsoft.Json.JsonSerializer();
-
         internal static async Task MonitorStreamAsync(Task<Stream> streamTask, DockerClient client, CancellationToken cancellationToken, IProgress<string> progress)
         {
             var tcs = new TaskCompletionSource<string>();
@@ -40,7 +38,7 @@ internal static async Task MonitorStreamForMessagesAsync<T>(Task<Stream> streamT
             {
                 while (await await Task.WhenAny(jsonReader.ReadAsync(cancellationToken), tcs.Task))
                 {
-                    var ev = await DeserializeAsync<T>(jsonReader, cancellationToken);
+                    var ev = await client.JsonSerializer.Deserialize<T>(jsonReader, cancellationToken);
                     progress.Report(ev);
                 }
             }
@@ -53,21 +51,5 @@ internal static async Task MonitorResponseForMessagesAsync<T>(Task<HttpResponseM
                 await MonitorStreamForMessagesAsync<T>(response.Content.ReadAsStreamAsync(), client, cancel, progress);
             }
         }
-
-        public static async Task<T> DeserializeAsync<T>(JsonReader jsonReader, CancellationToken cancellationToken)
-        {
-            var tcs = new TaskCompletionSource<T>();
-            using (cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken)))
-            {
-                await Task.Factory.StartNew(
-                    () => tcs.TrySetResult(_serializer.Deserialize<T>(jsonReader)),
-                    cancellationToken,
-                    TaskCreationOptions.LongRunning,
-                    TaskScheduler.Default
-                );
-
-                return await tcs.Task;
-            }
-        }
     }
 }

src/Docker.DotNet/JsonSerializer.cs

@@ -1,4 +1,6 @@
-using Newtonsoft.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
 namespace Docker.DotNet
@@ -8,6 +10,8 @@ namespace Docker.DotNet
     /// </summary>
     internal class JsonSerializer
     {
+        private readonly Newtonsoft.Json.JsonSerializer _serializer;
+
         private readonly JsonSerializerSettings _settings = new JsonSerializerSettings
         {
             NullValueHandling = NullValueHandling.Ignore,
@@ -24,6 +28,23 @@ internal class JsonSerializer
 
         public JsonSerializer()
         {
+            _serializer = Newtonsoft.Json.JsonSerializer.CreateDefault(this._settings);
+        }
+
+        public Task<T> Deserialize<T>(JsonReader jsonReader, CancellationToken cancellationToken)
+        {
+            var tcs = new TaskCompletionSource<T>();
+            using (cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken)))
+            {
+                Task.Factory.StartNew(
+                    () => tcs.TrySetResult(_serializer.Deserialize<T>(jsonReader)),
+                    cancellationToken,
+                    TaskCreationOptions.LongRunning,
+                    TaskScheduler.Default
+                );
+
+                return tcs.Task;
+            }
         }
 
         public T DeserializeObject<T>(string json)
@@ -36,4 +57,4 @@ public string SerializeObject<T>(T value)
             return JsonConvert.SerializeObject(value, this._settings);
         }
     }
-}
+}

test/Docker.DotNet.Tests/ISystemOperations.Tests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -88,17 +88,17 @@ public async Task MonitorEventsAsync_Succeeds()
             var progressJSONMessage = new Progress<JSONMessage>((m) =>
             {
                 // Status could be 'Pulling from...'
-                _output.WriteLine($"MonitorEventsAsync_Succeeds: JSONMessage - {m.ID} - {m.Status} {m.From} - {m.Stream}");
                 Assert.NotNull(m);
+                _output.WriteLine($"MonitorEventsAsync_Succeeds: JSONMessage - {m.ID} - {m.Status} {m.From} - {m.Stream}");
             });
 
             var wasProgressCalled = false;
 
             var progressMessage = new Progress<Message>((m) =>
             {
                 wasProgressCalled = true;
-                _output.WriteLine($"MonitorEventsAsync_Succeeds: Message - {m.Action} - {m.Status} {m.From} - {m.Type}");
                 Assert.NotNull(m);
+                _output.WriteLine($"MonitorEventsAsync_Succeeds: Message - {m.Action} - {m.Status} {m.From} - {m.Type}");
             });
 
             using var cts = CancellationTokenSource.CreateLinkedTokenSource(_cts.Token);
@@ -253,9 +253,9 @@ await _client.Images.TagImageAsync(
 
             var progress = new Progress<Message>((m) =>
             {
-                _output.WriteLine($"{MethodBase.GetCurrentMethod().Module}->{MethodBase.GetCurrentMethod().Name}: Message received: {m.Action} - {m.Status} {m.From} - {m.Type}");
-                Assert.True(m.Status == "tag" || m.Status == "untag");
                 progressCalledCounter++;
+                Assert.True(m.Status == "tag" || m.Status == "untag");
+                _output.WriteLine($"MonitorEventsFiltered_Succeeds: Message received: {m.Action} - {m.Status} {m.From} - {m.Type}");
             });
 
             using var cts = CancellationTokenSource.CreateLinkedTokenSource(_cts.Token);