removed the old enqueue interfaces, only action expressions are suppo…

…rted
brthor · Oct 22, 2017 · 510cf3a · 510cf3a
1 parent 5415fc0
commit 510cf3a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/TaskQueue.cs b/TaskQueue.cs
@@ -65,18 +65,8 @@ public void Enqueue(Expression<Action> expression)
             var taskInfo = m.ToTaskInfo(args);
             Enqueue(taskInfo);
         }
-
-        public void Enqueue<T>(Action<T> action, object[] args=null)
-        {
-            Enqueue(action.ToTaskInfo(args));
-        }
-
-        public void Enqueue(Action action, object[] args=null)
-        {
-            Enqueue(action.ToTaskInfo(args));
-        }
 
-        public void Enqueue(TaskInfo taskInfo)
+        private void Enqueue(TaskInfo taskInfo)
         {
             var settings = new JsonSerializerSettings
             {

diff --git a/Thor.Tasks.Tests/GivenARedisTaskQueue.cs b/Thor.Tasks.Tests/GivenARedisTaskQueue.cs
@@ -123,7 +123,7 @@ public async Task ItsTasksAreConsumedOnlyOnceByMultipleConsumers()
                 semaphoreFiles.Add(path);
 
                 var sharedTaskQueue = consumers[0].TaskQueue;
-                sharedTaskQueue.Enqueue<string>(TaskQueueTestFixture.WriteSempaphore, new object[] {path});
+                sharedTaskQueue.Enqueue(() => TaskQueueTestFixture.WriteSempaphore(path));
             }
 
             var tasks = new List<Task>();

diff --git a/Thor.Tasks.Tests/GivenATaskClient.cs b/Thor.Tasks.Tests/GivenATaskClient.cs
@@ -16,8 +16,8 @@ public void ItContinuesListeningWhenATaskThrowsAnException()
             var taskClient = new TaskClient(TaskQueue.Redis("localhost:6379", nameof(ItContinuesListeningWhenATaskThrowsAnException)));
             var semaphoreFile = Path.GetTempFileName();
 
-            taskClient.TaskQueue.Enqueue(Throw);
-            taskClient.TaskQueue.Enqueue<string>(TaskQueueTestFixture.WriteSempaphore, new object[] {semaphoreFile});
+            taskClient.TaskQueue.Enqueue(() => Throw());
+            taskClient.TaskQueue.Enqueue(() => TaskQueueTestFixture.WriteSempaphore(semaphoreFile));
 
             var task = Task.Run(() => taskClient.Listen());
             Thread.Sleep(waitTime);

diff --git a/Thor.Tasks.Tests/TestQueueTestFixture.cs b/Thor.Tasks.Tests/TestQueueTestFixture.cs
@@ -30,7 +30,7 @@ public TaskQueueTestFixture(string uniqueId, TaskQueue taskQueue=null)
 
         public void PushPopExecuteWriteSemaphore()
         {
-            TaskQueue.Enqueue<string>(WriteSempaphore, new object[] {_semaphoreFile});
+            TaskQueue.Enqueue(() => WriteSempaphore(_semaphoreFile));
             var dequeuedTaskInfo = TaskQueue.Dequeue();
             dequeuedTaskInfo.ExecuteTask();
         }