Factor the task info serializer

Author: brthor

ITaskInfoSerializer.cs

@@ -0,0 +1,9 @@
+namespace Gofer.NET
+{
+    public interface ITaskInfoSerializer
+    {
+        string Serialize(TaskInfo taskInfo);
+
+        TaskInfo Deserialize(string taskInfoJsonString);
+    }
+}

JsonTaskInfoSerializer.cs

@@ -0,0 +1,37 @@
+using Newtonsoft.Json;
+
+namespace Gofer.NET
+{
+    public class JsonTaskInfoSerializer : ITaskInfoSerializer
+    {
+        public string Serialize(TaskInfo taskInfo)
+        {
+            var settings = new JsonSerializerSettings
+            {
+                TypeNameHandling = TypeNameHandling.All
+            };
+            settings.Converters.Insert(0, new JsonPrimitiveConverter());
+            
+            var jsonString = JsonConvert.SerializeObject(taskInfo, settings);
+
+            return jsonString;
+        }
+
+        public TaskInfo Deserialize(string taskInfoJsonString)
+        {
+            if (taskInfoJsonString == null)
+            {
+                return null;
+            }
+            
+            var settings = new JsonSerializerSettings
+            {
+                TypeNameHandling = TypeNameHandling.All
+            };
+            settings.Converters.Insert(0, new JsonPrimitiveConverter());
+
+            var taskInfo = JsonConvert.DeserializeObject<TaskInfo>(taskInfoJsonString, settings);
+            return taskInfo;
+        }
+    }
+}

Messages.cs

@@ -13,4 +13,4 @@ public static string TaskStarted(TaskInfo info) =>
         public static string TaskFinished(TaskInfo info, double completionSeconds) => 
             $"[{DateTime.Now.ToShortTimeString()}] Task Finished ({completionSeconds}s): {info.AssemblyName}.{info.MethodName} (Task Id: {info.Id})";
     }
-}
+}

TaskQueue.cs

@@ -33,13 +33,7 @@ public void Enqueue(Expression<Action> expression)
 
         private void Enqueue(TaskInfo taskInfo)
         {
-            var settings = new JsonSerializerSettings
-            {
-                TypeNameHandling = TypeNameHandling.All
-            };
-            settings.Converters.Insert(0, new JsonPrimitiveConverter());
-            
-            var jsonString = JsonConvert.SerializeObject(taskInfo, settings);
+            var jsonString = Config.TaskInfoSerializer.Serialize(taskInfo);
 
             Backend.Enqueue(jsonString);
         }
@@ -61,29 +55,35 @@ public void ExecuteNext()
         public Tuple<string, TaskInfo> SafeDequeue()
         {
             var jsonString = Backend.DequeueAndBackup();
-            var taskInfo = JsonToTaskInfo(jsonString);
+            var taskInfo = Config.TaskInfoSerializer.Deserialize(jsonString);
             return Tuple.Create(jsonString, taskInfo);
         }
 
         public TaskInfo Dequeue()
         {
             var jsonString = Backend.Dequeue();
-            var taskInfo = JsonToTaskInfo(jsonString);
+            var taskInfo = Config.TaskInfoSerializer.Deserialize(jsonString);
             return taskInfo;
         }
 
         public void RestoreExpiredBackupTasks()
         {
             TaskInfo taskInfo;
 
-            while ((taskInfo = JsonToTaskInfo(Backend.PeekBackup()))?.IsExpired(Config.MessageRetryTimeSpan) ?? false)
+            while (true)
             {
+                taskInfo = Config.TaskInfoSerializer.Deserialize(Backend.PeekBackup());
+                if (taskInfo?.IsExpired(Config.MessageRetryTimeSpan) ?? false)
+                {
+                    break;
+                }
+                
                 var lockKey = nameof(RestoreExpiredBackupTasks) + "::" + taskInfo.Id;
                 var backupLock = Backend.LockBlocking(lockKey);
 
                 try
                 {
-                    var currentTop = JsonToTaskInfo(Backend.PeekBackup());
+                    var currentTop = Config.TaskInfoSerializer.Deserialize(Backend.PeekBackup());
                     if (currentTop.Id.Equals(taskInfo.Id))
                     {
                         Backend.RestoreTopBackup();
@@ -95,22 +95,5 @@ public void RestoreExpiredBackupTasks()
                 }
             }
         }
-
-        private TaskInfo JsonToTaskInfo(string jsonString)
-        {
-            if (jsonString == null)
-            {
-                return null;
-            }
-            
-            var settings = new JsonSerializerSettings
-            {
-                TypeNameHandling = TypeNameHandling.All
-            };
-            settings.Converters.Insert(0, new JsonPrimitiveConverter());
-
-            var taskInfo = JsonConvert.DeserializeObject<TaskInfo>(jsonString, settings);
-            return taskInfo;
-        }
     }
 }

TaskQueueConfiguration.cs

@@ -24,14 +24,17 @@ public class TaskQueueConfiguration
         /// </summary>
         public bool ThreadSafe { get; set; }
 
+        public ITaskInfoSerializer TaskInfoSerializer { get; set; }
+        
         public static TaskQueueConfiguration Default()
         {
             return new TaskQueueConfiguration
             {
                 QueueName = "Gofer.NET.Default",
                 BackupQueueName = "Gofer.NET.Backup.Default",
                 ThreadSafe = true,
-                MessageRetryTimeSpan = TimeSpan.FromHours(1)
+                MessageRetryTimeSpan = TimeSpan.FromHours(1),
+                TaskInfoSerializer = new JsonTaskInfoSerializer()
             };
         }
     }