code clean up

damienbod · damienbod · commit a485a9ccb1df · 2024-06-30T10:51:34.000+02:00
diff --git a/AspNetCoreServiceBusApi1/Controllers/PayloadController.cs b/AspNetCoreServiceBusApi1/Controllers/PayloadController.cs
@@ -62,7 +62,7 @@ await _serviceBusSender.SendMessage(new MyPayload
             Goals = request.Goals,
             Name = request.Name,
             Delete = false
-        }).ConfigureAwait(false);
+        });
 
         return Ok(request);
     }
@@ -90,7 +90,7 @@ await _serviceBusSender.SendMessage(new MyPayload
             Goals = request.Goals,
             Name = request.Name,
             Delete = false
-        }).ConfigureAwait(false);
+        });
 
         return Ok(request);
     }
@@ -123,7 +123,7 @@ await _serviceBusSender.SendMessage(new MyPayload
             Goals = item.Goals,
             Name = item.Name,
             Delete = true
-        }).ConfigureAwait(false);
+        });
 
         return Ok();
     }
diff --git a/AspNetCoreServiceBusApi1/Controllers/TopicController.cs b/AspNetCoreServiceBusApi1/Controllers/TopicController.cs
@@ -62,7 +62,7 @@ await _serviceBusTopicSender.SendMessage(new MyPayload
             Goals = request.Goals,
             Name = request.Name,
             Delete = false
-        }).ConfigureAwait(false);
+        });
 
         return Ok(request);
     }
@@ -90,7 +90,7 @@ await _serviceBusTopicSender.SendMessage(new MyPayload
             Goals = request.Goals,
             Name = request.Name,
             Delete = false
-        }).ConfigureAwait(false);
+        });
 
         return Ok(request);
     }
@@ -123,7 +123,7 @@ await _serviceBusTopicSender.SendMessage(new MyPayload
             Goals = item.Goals,
             Name = item.Name,
             Delete = true
-        }).ConfigureAwait(false);
+        });
 
         return Ok();
     }
diff --git a/AspNetCoreServiceBusApi2/ProcessData.cs b/AspNetCoreServiceBusApi2/ProcessData.cs
@@ -23,8 +23,8 @@ await payloadMessageContext.AddAsync(new Payload
             Name = myPayload.Name,
             Goals = myPayload.Goals,
             Created = DateTime.UtcNow
-        }).ConfigureAwait(false);
+        });
 
-        await payloadMessageContext.SaveChangesAsync().ConfigureAwait(false);
+        await payloadMessageContext.SaveChangesAsync();
     }
 }
diff --git a/AspNetCoreServiceBusApi2/WorkerServiceBus.cs b/AspNetCoreServiceBusApi2/WorkerServiceBus.cs
@@ -20,15 +20,15 @@ public WorkerServiceBus(IServiceBusConsumer serviceBusConsumer,
     public async Task StartAsync(CancellationToken stoppingToken)
     {
         _logger.LogDebug("Starting the service bus queue consumer and the subscription");
-        await _serviceBusConsumer.RegisterOnMessageHandlerAndReceiveMessages().ConfigureAwait(false);
-        await _serviceBusTopicSubscription.PrepareFiltersAndHandleMessages().ConfigureAwait(false);
+        await _serviceBusConsumer.RegisterOnMessageHandlerAndReceiveMessages();
+        await _serviceBusTopicSubscription.PrepareFiltersAndHandleMessages();
     }
 
     public async Task StopAsync(CancellationToken stoppingToken)
     {
         _logger.LogDebug("Stopping the service bus queue consumer and the subscription");
-        await _serviceBusConsumer.CloseQueueAsync().ConfigureAwait(false);
-        await _serviceBusTopicSubscription.CloseSubscriptionAsync().ConfigureAwait(false);
+        await _serviceBusConsumer.CloseQueueAsync();
+        await _serviceBusTopicSubscription.CloseSubscriptionAsync();
     }
 
     public void Dispose()
@@ -41,8 +41,8 @@ protected virtual async void Dispose(bool disposing)
     {
         if (disposing)
         {
-            await _serviceBusConsumer.DisposeAsync().ConfigureAwait(false);
-            await _serviceBusTopicSubscription.DisposeAsync().ConfigureAwait(false);
+            await _serviceBusConsumer.DisposeAsync();
+            await _serviceBusTopicSubscription.DisposeAsync();
         }
     }
 }
diff --git a/ReducedAccessRightsQueueSender/Program.cs b/ReducedAccessRightsQueueSender/Program.cs
@@ -15,6 +15,6 @@ static async Task Main(string[] args)
 
         //string messagePayload = JsonSerializer.Serialize(payload);
         var message = new ServiceBusMessage("some message from somewhere");
-        await _clientSender.SendMessageAsync(message).ConfigureAwait(false);
+        await _clientSender.SendMessageAsync(message);
     }
 }
diff --git a/ServiceBusMessaging/ServiceBusConsumer.cs b/ServiceBusMessaging/ServiceBusConsumer.cs
@@ -43,7 +43,7 @@ public async Task RegisterOnMessageHandlerAndReceiveMessages()
         _processor = _client.CreateProcessor(QUEUE_NAME, _serviceBusProcessorOptions);
         _processor.ProcessMessageAsync += ProcessMessagesAsync;
         _processor.ProcessErrorAsync += ProcessErrorAsync;
-        await _processor.StartProcessingAsync().ConfigureAwait(false);
+        await _processor.StartProcessingAsync();
     }
 
     private Task ProcessErrorAsync(ProcessErrorEventArgs arg)
@@ -59,25 +59,25 @@ private Task ProcessErrorAsync(ProcessErrorEventArgs arg)
     private async Task ProcessMessagesAsync(ProcessMessageEventArgs args)
     {
         var myPayload = args.Message.Body.ToObjectFromJson<MyPayload>();
-        await _processData.Process(myPayload).ConfigureAwait(false);
-        await args.CompleteMessageAsync(args.Message).ConfigureAwait(false);
+        await _processData.Process(myPayload);
+        await args.CompleteMessageAsync(args.Message);
     }
 
     public async ValueTask DisposeAsync()
     {
         if (_processor != null)
         {
-            await _processor.DisposeAsync().ConfigureAwait(false);
+            await _processor.DisposeAsync();
         }
 
         if (_client != null)
         {
-            await _client.DisposeAsync().ConfigureAwait(false);
+            await _client.DisposeAsync();
         }
     }
 
     public async Task CloseQueueAsync()
     {
-        await _processor!.CloseAsync().ConfigureAwait(false);
+        await _processor!.CloseAsync();
     }
 }
diff --git a/ServiceBusMessaging/ServiceBusSender.cs b/ServiceBusMessaging/ServiceBusSender.cs
@@ -21,6 +21,6 @@ public async Task SendMessage(MyPayload payload)
     {
         string messagePayload = JsonSerializer.Serialize(payload);
         var message = new ServiceBusMessage(messagePayload);
-        await _clientSender.SendMessageAsync(message).ConfigureAwait(false);
+        await _clientSender.SendMessageAsync(message);
     }
 }
diff --git a/ServiceBusMessaging/ServiceBusTopicSender.cs b/ServiceBusMessaging/ServiceBusTopicSender.cs
@@ -31,7 +31,7 @@ public async Task SendMessage(MyPayload payload)
 
         try
         {
-            await _clientSender.SendMessageAsync(message).ConfigureAwait(false);
+            await _clientSender.SendMessageAsync(message);
         }
         catch (Exception e)
         {
diff --git a/ServiceBusMessaging/ServiceBusTopicSubscription.cs b/ServiceBusMessaging/ServiceBusTopicSubscription.cs
@@ -42,10 +42,10 @@ public async Task PrepareFiltersAndHandleMessages()
         _processor.ProcessMessageAsync += ProcessMessagesAsync;
         _processor.ProcessErrorAsync += ProcessErrorAsync;
 
-        await RemoveDefaultFilters().ConfigureAwait(false);
-        await AddFilters().ConfigureAwait(false);
+        await RemoveDefaultFilters();
+        await AddFilters();
 
-        await _processor.StartProcessingAsync().ConfigureAwait(false);
+        await _processor.StartProcessingAsync();
     }
 
     private async Task RemoveDefaultFilters()
@@ -63,8 +63,7 @@ private async Task RemoveDefaultFilters()
             {
                 if (rule.Name == "GoalsGreaterThanSeven")
                 {
-                    await _adminClient.DeleteRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, "GoalsGreaterThanSeven")
-                        .ConfigureAwait(false);
+                    await _adminClient.DeleteRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, "GoalsGreaterThanSeven");
                 }
             }
         }
@@ -78,8 +77,7 @@ private async Task AddFilters()
     {
         try
         {
-            var rules = _adminClient.GetRulesAsync(TOPIC_PATH, SUBSCRIPTION_NAME)
-                .ConfigureAwait(false);
+            var rules = _adminClient.GetRulesAsync(TOPIC_PATH, SUBSCRIPTION_NAME);
 
             var ruleProperties = new List<RuleProperties>();
             await foreach (var rule in rules)
@@ -94,8 +92,7 @@ private async Task AddFilters()
                     Name = "GoalsGreaterThanSeven",
                     Filter = new SqlRuleFilter("goals > 7")
                 };
-                await _adminClient.CreateRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, createRuleOptions)
-                    .ConfigureAwait(false);
+                await _adminClient.CreateRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, createRuleOptions);
             }
         }
         catch (Exception ex)
@@ -107,8 +104,8 @@ await _adminClient.CreateRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, createRuleOpti
     private async Task ProcessMessagesAsync(ProcessMessageEventArgs args)
     {
         var myPayload = args.Message.Body.ToObjectFromJson<MyPayload>();
-        await _processData.Process(myPayload).ConfigureAwait(false);
-        await args.CompleteMessageAsync(args.Message).ConfigureAwait(false);
+        await _processData.Process(myPayload);
+        await args.CompleteMessageAsync(args.Message);
     }
 
     private Task ProcessErrorAsync(ProcessErrorEventArgs arg)
@@ -125,17 +122,17 @@ public async ValueTask DisposeAsync()
     {
         if (_processor != null)
         {
-            await _processor.DisposeAsync().ConfigureAwait(false);
+            await _processor.DisposeAsync();
         }
 
         if (_client != null)
         {
-            await _client.DisposeAsync().ConfigureAwait(false);
+            await _client.DisposeAsync();
         }
     }
 
     public async Task CloseSubscriptionAsync()
     {
-        await _processor!.CloseAsync().ConfigureAwait(false);
+        await _processor!.CloseAsync();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ await payloadMessageContext.AddAsync(new Payload`
`23`	`23`	`Name = myPayload.Name,`
`24`	`24`	`Goals = myPayload.Goals,`
`25`	`25`	`Created = DateTime.UtcNow`
`26`		`- }).ConfigureAwait(false);`
	`26`	`+ });`
`27`	`27`
`28`		`- await payloadMessageContext.SaveChangesAsync().ConfigureAwait(false);`
	`28`	`+ await payloadMessageContext.SaveChangesAsync();`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,15 @@ public WorkerServiceBus(IServiceBusConsumer serviceBusConsumer,`
`20`	`20`	`public async Task StartAsync(CancellationToken stoppingToken)`
`21`	`21`	`{`
`22`	`22`	`_logger.LogDebug("Starting the service bus queue consumer and the subscription");`
`23`		`- await _serviceBusConsumer.RegisterOnMessageHandlerAndReceiveMessages().ConfigureAwait(false);`
`24`		`- await _serviceBusTopicSubscription.PrepareFiltersAndHandleMessages().ConfigureAwait(false);`
	`23`	`+ await _serviceBusConsumer.RegisterOnMessageHandlerAndReceiveMessages();`
	`24`	`+ await _serviceBusTopicSubscription.PrepareFiltersAndHandleMessages();`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public async Task StopAsync(CancellationToken stoppingToken)`
`28`	`28`	`{`
`29`	`29`	`_logger.LogDebug("Stopping the service bus queue consumer and the subscription");`
`30`		`- await _serviceBusConsumer.CloseQueueAsync().ConfigureAwait(false);`
`31`		`- await _serviceBusTopicSubscription.CloseSubscriptionAsync().ConfigureAwait(false);`
	`30`	`+ await _serviceBusConsumer.CloseQueueAsync();`
	`31`	`+ await _serviceBusTopicSubscription.CloseSubscriptionAsync();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public void Dispose()`
`@@ -41,8 +41,8 @@ protected virtual async void Dispose(bool disposing)`
`41`	`41`	`{`
`42`	`42`	`if (disposing)`
`43`	`43`	`{`
`44`		`- await _serviceBusConsumer.DisposeAsync().ConfigureAwait(false);`
`45`		`- await _serviceBusTopicSubscription.DisposeAsync().ConfigureAwait(false);`
	`44`	`+ await _serviceBusConsumer.DisposeAsync();`
	`45`	`+ await _serviceBusTopicSubscription.DisposeAsync();`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ static async Task Main(string[] args)`
`15`	`15`
`16`	`16`	`//string messagePayload = JsonSerializer.Serialize(payload);`
`17`	`17`	`var message = new ServiceBusMessage("some message from somewhere");`
`18`		`- await _clientSender.SendMessageAsync(message).ConfigureAwait(false);`
	`18`	`+ await _clientSender.SendMessageAsync(message);`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public async Task RegisterOnMessageHandlerAndReceiveMessages()`
`43`	`43`	`_processor = _client.CreateProcessor(QUEUE_NAME, _serviceBusProcessorOptions);`
`44`	`44`	`_processor.ProcessMessageAsync += ProcessMessagesAsync;`
`45`	`45`	`_processor.ProcessErrorAsync += ProcessErrorAsync;`
`46`		`- await _processor.StartProcessingAsync().ConfigureAwait(false);`
	`46`	`+ await _processor.StartProcessingAsync();`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`private Task ProcessErrorAsync(ProcessErrorEventArgs arg)`
`@@ -59,25 +59,25 @@ private Task ProcessErrorAsync(ProcessErrorEventArgs arg)`
`59`	`59`	`private async Task ProcessMessagesAsync(ProcessMessageEventArgs args)`
`60`	`60`	`{`
`61`	`61`	`var myPayload = args.Message.Body.ToObjectFromJson<MyPayload>();`
`62`		`- await _processData.Process(myPayload).ConfigureAwait(false);`
`63`		`- await args.CompleteMessageAsync(args.Message).ConfigureAwait(false);`
	`62`	`+ await _processData.Process(myPayload);`
	`63`	`+ await args.CompleteMessageAsync(args.Message);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public async ValueTask DisposeAsync()`
`67`	`67`	`{`
`68`	`68`	`if (_processor != null)`
`69`	`69`	`{`
`70`		`- await _processor.DisposeAsync().ConfigureAwait(false);`
	`70`	`+ await _processor.DisposeAsync();`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`if (_client != null)`
`74`	`74`	`{`
`75`		`- await _client.DisposeAsync().ConfigureAwait(false);`
	`75`	`+ await _client.DisposeAsync();`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public async Task CloseQueueAsync()`
`80`	`80`	`{`
`81`		`- await _processor!.CloseAsync().ConfigureAwait(false);`
	`81`	`+ await _processor!.CloseAsync();`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ public async Task SendMessage(MyPayload payload)`
`21`	`21`	`{`
`22`	`22`	`string messagePayload = JsonSerializer.Serialize(payload);`
`23`	`23`	`var message = new ServiceBusMessage(messagePayload);`
`24`		`- await _clientSender.SendMessageAsync(message).ConfigureAwait(false);`
	`24`	`+ await _clientSender.SendMessageAsync(message);`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public async Task SendMessage(MyPayload payload)`
`31`	`31`
`32`	`32`	`try`
`33`	`33`	`{`
`34`		`- await _clientSender.SendMessageAsync(message).ConfigureAwait(false);`
	`34`	`+ await _clientSender.SendMessageAsync(message);`
`35`	`35`	`}`
`36`	`36`	`catch (Exception e)`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,10 @@ public async Task PrepareFiltersAndHandleMessages()`
`42`	`42`	`_processor.ProcessMessageAsync += ProcessMessagesAsync;`
`43`	`43`	`_processor.ProcessErrorAsync += ProcessErrorAsync;`
`44`	`44`
`45`		`- await RemoveDefaultFilters().ConfigureAwait(false);`
`46`		`- await AddFilters().ConfigureAwait(false);`
	`45`	`+ await RemoveDefaultFilters();`
	`46`	`+ await AddFilters();`
`47`	`47`
`48`		`- await _processor.StartProcessingAsync().ConfigureAwait(false);`
	`48`	`+ await _processor.StartProcessingAsync();`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`private async Task RemoveDefaultFilters()`
`@@ -63,8 +63,7 @@ private async Task RemoveDefaultFilters()`
`63`	`63`	`{`
`64`	`64`	`if (rule.Name == "GoalsGreaterThanSeven")`
`65`	`65`	`{`
`66`		`- await _adminClient.DeleteRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, "GoalsGreaterThanSeven")`
`67`		`- .ConfigureAwait(false);`
	`66`	`+ await _adminClient.DeleteRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, "GoalsGreaterThanSeven");`
`68`	`67`	`}`
`69`	`68`	`}`
`70`	`69`	`}`
`@@ -78,8 +77,7 @@ private async Task AddFilters()`
`78`	`77`	`{`
`79`	`78`	`try`
`80`	`79`	`{`
`81`		`- var rules = _adminClient.GetRulesAsync(TOPIC_PATH, SUBSCRIPTION_NAME)`
`82`		`- .ConfigureAwait(false);`
	`80`	`+ var rules = _adminClient.GetRulesAsync(TOPIC_PATH, SUBSCRIPTION_NAME);`
`83`	`81`
`84`	`82`	`var ruleProperties = new List<RuleProperties>();`
`85`	`83`	`await foreach (var rule in rules)`
`@@ -94,8 +92,7 @@ private async Task AddFilters()`
`94`	`92`	`Name = "GoalsGreaterThanSeven",`
`95`	`93`	`Filter = new SqlRuleFilter("goals > 7")`
`96`	`94`	`};`
`97`		`- await _adminClient.CreateRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, createRuleOptions)`
`98`		`- .ConfigureAwait(false);`
	`95`	`+ await _adminClient.CreateRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, createRuleOptions);`
`99`	`96`	`}`
`100`	`97`	`}`
`101`	`98`	`catch (Exception ex)`
`@@ -107,8 +104,8 @@ await _adminClient.CreateRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, createRuleOpti`
`107`	`104`	`private async Task ProcessMessagesAsync(ProcessMessageEventArgs args)`
`108`	`105`	`{`
`109`	`106`	`var myPayload = args.Message.Body.ToObjectFromJson<MyPayload>();`
`110`		`- await _processData.Process(myPayload).ConfigureAwait(false);`
`111`		`- await args.CompleteMessageAsync(args.Message).ConfigureAwait(false);`
	`107`	`+ await _processData.Process(myPayload);`
	`108`	`+ await args.CompleteMessageAsync(args.Message);`
`112`	`109`	`}`
`113`	`110`
`114`	`111`	`private Task ProcessErrorAsync(ProcessErrorEventArgs arg)`
`@@ -125,17 +122,17 @@ public async ValueTask DisposeAsync()`
`125`	`122`	`{`
`126`	`123`	`if (_processor != null)`
`127`	`124`	`{`
`128`		`- await _processor.DisposeAsync().ConfigureAwait(false);`
	`125`	`+ await _processor.DisposeAsync();`
`129`	`126`	`}`
`130`	`127`
`131`	`128`	`if (_client != null)`
`132`	`129`	`{`
`133`		`- await _client.DisposeAsync().ConfigureAwait(false);`
	`130`	`+ await _client.DisposeAsync();`
`134`	`131`	`}`
`135`	`132`	`}`
`136`	`133`
`137`	`134`	`public async Task CloseSubscriptionAsync()`
`138`	`135`	`{`
`139`		`- await _processor!.CloseAsync().ConfigureAwait(false);`
	`136`	`+ await _processor!.CloseAsync();`
`140`	`137`	`}`
`141`	`138`	`}`