rename type alias Tasks to Async

microsoft · Apr 11, 2022 · d891a02 · d891a02
1 parent 3382d3b
commit d891a02
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/src/ApiService/ApiService/Program.cs b/src/ApiService/ApiService/Program.cs
@@ -1,5 +1,5 @@
 // to avoid collision with Task in model.cs
-global using Tasks = System.Threading.Tasks;
+global using Async = System.Threading.Tasks;
 
 using System;
 using System.Collections.Generic;

diff --git a/src/ApiService/ApiService/QueueFileChanges.cs b/src/ApiService/ApiService/QueueFileChanges.cs
@@ -27,7 +27,7 @@ public QueueFileChanges(ILoggerFactory loggerFactory, IStorageProvider storagePr
     }
 
     [Function("QueueFileChanges")]
-    public Tasks.Task Run(
+    public Async.Task Run(
         [QueueTrigger("file-changes-refactored", Connection = "AzureWebJobsStorage")] string msg,
         int dequeueCount)
     {
@@ -41,18 +41,18 @@ public Tasks.Task Run(
         if (!fileChangeEvent.ContainsKey(eventType)
             || fileChangeEvent[eventType] != "Microsoft.Storage.BlobCreated")
         {
-            return Tasks.Task.CompletedTask;
+            return Async.Task.CompletedTask;
         }
 
         const string topic = "topic";
         if (!fileChangeEvent.ContainsKey(topic)
             || !_storage.CorpusAccounts().Contains(fileChangeEvent[topic]))
         {
-            return Tasks.Task.CompletedTask;
+            return Async.Task.CompletedTask;
         }
 
         file_added(fileChangeEvent, lastTry);
-        return Tasks.Task.CompletedTask;
+        return Async.Task.CompletedTask;
     }
 
     private void file_added(Dictionary<string, string> fileChangeEvent, bool failTaskOnTransientError)

diff --git a/src/ApiService/ApiService/QueueNodeHearbeat.cs b/src/ApiService/ApiService/QueueNodeHearbeat.cs
@@ -22,7 +22,7 @@ public QueueNodeHearbeat(ILoggerFactory loggerFactory, INodeOperations nodes, IE
     }
 
     [Function("QueueNodeHearbeat")]
-    public async Tasks.Task Run([QueueTrigger("myqueue-items", Connection = "AzureWebJobsStorage")] string msg)
+    public async Async.Task Run([QueueTrigger("myqueue-items", Connection = "AzureWebJobsStorage")] string msg)
     {
         _logger.LogInformation($"heartbeat: {msg}");
 

diff --git a/src/ApiService/ApiService/QueueTaskHearbeat.cs b/src/ApiService/ApiService/QueueTaskHearbeat.cs
@@ -22,7 +22,7 @@ public QueueTaskHearbeat(ILoggerFactory loggerFactory, ITaskOperations tasks, IE
     }
 
     [Function("QueueNodeHearbeat")]
-    public async Tasks.Task Run([QueueTrigger("myqueue-items2", Connection = "AzureWebJobsStorage")] string msg)
+    public async Async.Task Run([QueueTrigger("myqueue-items2", Connection = "AzureWebJobsStorage")] string msg)
     {
         _logger.LogInformation($"heartbeat: {msg}");
 

diff --git a/src/ApiService/ApiService/UserCredentials.cs b/src/ApiService/ApiService/UserCredentials.cs
@@ -54,7 +54,7 @@ public class UserCredentials
 
     static Task<OneFuzzResult<string[]>> GetAllowedTenants()
     {
-        return Tasks.Task.FromResult(OneFuzzResult<string[]>.Ok(Array.Empty<string>()));
+        return Async.Task.FromResult(OneFuzzResult<string[]>.Ok(Array.Empty<string>()));
     }
 
     /*

diff --git a/src/ApiService/ApiService/onefuzzlib/Events.cs b/src/ApiService/ApiService/onefuzzlib/Events.cs
@@ -20,9 +20,9 @@ List<EventMessage> arguments
 
     public interface IEvents
     {
-        public Tasks.Task SendEvent(BaseEvent anEvent);
+        public Async.Task SendEvent(BaseEvent anEvent);
 
-        public Tasks.Task QueueSignalrEvent(EventMessage message);
+        public Async.Task QueueSignalrEvent(EventMessage message);
     }
 
     public class Events : IEvents
@@ -38,14 +38,14 @@ public Events(IQueue queue, ILoggerFactory loggerFactory, IWebhookOperations web
             _webhook = webhook;
         }
 
-        public async Tasks.Task QueueSignalrEvent(EventMessage eventMessage)
+        public async Async.Task QueueSignalrEvent(EventMessage eventMessage)
         {
             var message = new SignalREvent("events", new List<EventMessage>() { eventMessage });
             var encodedMessage = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(message));
             await _queue.SendMessage("signalr-events", encodedMessage, StorageType.Config);
         }
 
-        public async Tasks.Task SendEvent(BaseEvent anEvent)
+        public async Async.Task SendEvent(BaseEvent anEvent)
         {
             var eventType = anEvent.GetEventType();
 

diff --git a/src/ApiService/ApiService/onefuzzlib/Queue.cs b/src/ApiService/ApiService/onefuzzlib/Queue.cs
@@ -9,8 +9,8 @@
 namespace Microsoft.OneFuzz.Service;
 public interface IQueue
 {
-    Tasks.Task SendMessage(string name, byte[] message, StorageType storageType, TimeSpan? visibilityTimeout = null, TimeSpan? timeToLive = null);
-    Tasks.Task<bool> QueueObject<T>(string name, T obj, StorageType storageType, TimeSpan? visibilityTimeout);
+    Async.Task SendMessage(string name, byte[] message, StorageType storageType, TimeSpan? visibilityTimeout = null, TimeSpan? timeToLive = null);
+    Async.Task<bool> QueueObject<T>(string name, T obj, StorageType storageType, TimeSpan? visibilityTimeout);
 }
 
 
@@ -26,7 +26,7 @@ public Queue(IStorage storage, ILoggerFactory loggerFactory)
     }
 
 
-    public async Tasks.Task SendMessage(string name, byte[] message, StorageType storageType, TimeSpan? visibilityTimeout = null, TimeSpan? timeToLive = null)
+    public async Async.Task SendMessage(string name, byte[] message, StorageType storageType, TimeSpan? visibilityTimeout = null, TimeSpan? timeToLive = null)
     {
         var queue = GetQueue(name, storageType);
         if (queue != null)

diff --git a/src/ApiService/ApiService/onefuzzlib/TaskOperations.cs b/src/ApiService/ApiService/onefuzzlib/TaskOperations.cs
@@ -6,7 +6,7 @@ namespace Microsoft.OneFuzz.Service;
 
 public interface ITaskOperations : IOrm<Task>
 {
-    Tasks.Task<Task?> GetByTaskId(Guid taskId);
+    Async.Task<Task?> GetByTaskId(Guid taskId);
 }
 
 public class TaskOperations : Orm<Task>, ITaskOperations
@@ -18,7 +18,7 @@ public TaskOperations(IStorage storage)
 
     }
 
-    public async Tasks.Task<Task?> GetByTaskId(Guid taskId)
+    public async Async.Task<Task?> GetByTaskId(Guid taskId)
     {
         var data = QueryAsync(filter: $"RowKey eq '{taskId}'");
 

diff --git a/src/ApiService/ApiService/onefuzzlib/WebhookOperations.cs b/src/ApiService/ApiService/onefuzzlib/WebhookOperations.cs
@@ -29,7 +29,7 @@ public WebhookMessageLogOperations(IStorage storage, IQueue queue, ILoggerFactor
     }
 
 
-    public async Tasks.Task QueueWebhook(WebhookMessageLog webhookLog)
+    public async Async.Task QueueWebhook(WebhookMessageLog webhookLog)
     {
         var obj = new WebhookMessageQueueObj(webhookLog.WebhookId, webhookLog.EventId);
 
@@ -61,7 +61,7 @@ private void QueueObject(string v, WebhookMessageQueueObj obj, StorageType confi
 
 public interface IWebhookOperations
 {
-    Tasks.Task SendEvent(EventMessage eventMessage);
+    Async.Task SendEvent(EventMessage eventMessage);
 }
 
 public class WebhookOperations : Orm<Webhook>, IWebhookOperations
@@ -73,7 +73,7 @@ public WebhookOperations(IStorage storage, IWebhookMessageLogOperations webhookM
         _webhookMessageLogOperations = webhookMessageLogOperations;
     }
 
-    async public Tasks.Task SendEvent(EventMessage eventMessage)
+    async public Async.Task SendEvent(EventMessage eventMessage)
     {
         await foreach (var webhook in GetWebhooksCached())
         {
@@ -85,7 +85,7 @@ async public Tasks.Task SendEvent(EventMessage eventMessage)
         }
     }
 
-    async private Tasks.Task AddEvent(Webhook webhook, EventMessage eventMessage)
+    async private Async.Task AddEvent(Webhook webhook, EventMessage eventMessage)
     {
         var message = new WebhookMessageLog(
              EventId: eventMessage.EventId,
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ public class UserCredentials @@
         static Task<OneFuzzResult<string[]>> GetAllowedTenants()
         {
-            return Tasks.Task.FromResult(OneFuzzResult<string[]>.Ok(Array.Empty<string>()));
+            return Async.Task.FromResult(OneFuzzResult<string[]>.Ok(Array.Empty<string>()));
         }
         /*
@@ Expand Down @@