Updated code styles

damienbod · damienbod · commit e65ddca95f08 · 2023-04-28T17:11:18.000+02:00
diff --git a/AspNetCoreServiceBusApi1/AspNetCoreServiceBusApi1.csproj b/AspNetCoreServiceBusApi1/AspNetCoreServiceBusApi1.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>d0554286-1d65-4180-9043-bc78d9085329</UserSecretsId>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/AspNetCoreServiceBusApi1/Controllers/PayloadController.cs b/AspNetCoreServiceBusApi1/Controllers/PayloadController.cs
@@ -9,7 +9,7 @@ namespace AspNetCoreServiceBusApi1.Controllers;
 [ApiController]
 public class PayloadController : Controller
 {
-    private ServiceBusSender _serviceBusSender;
+    private readonly ServiceBusSender _serviceBusSender;
 
     public PayloadController(ServiceBusSender serviceBusSender)
     {
@@ -128,7 +128,7 @@ await _serviceBusSender.SendMessage(new MyPayload
         return Ok();
     }
 
-    private static readonly List<Payload> data = new List<Payload>
+    private static readonly List<Payload> data = new()
     {
         new Payload{ Id=1, Goals=3, Name="wow"},
         new Payload{ Id=2, Goals=4, Name="not so bad"},
diff --git a/AspNetCoreServiceBusApi1/Controllers/TopicController.cs b/AspNetCoreServiceBusApi1/Controllers/TopicController.cs
@@ -128,7 +128,7 @@ await _serviceBusTopicSender.SendMessage(new MyPayload
         return Ok();
     }
 
-    private static readonly List<Payload> data = new List<Payload>
+    private static readonly List<Payload> data = new()
     {
         new Payload{ Id=1, Goals=3, Name="wow"},
         new Payload{ Id=2, Goals=4, Name="not so bad"},
diff --git a/AspNetCoreServiceBusApi1/Model/Payload.cs b/AspNetCoreServiceBusApi1/Model/Payload.cs
@@ -3,6 +3,6 @@
 public class Payload
 {
     public int Id { get; set; }
-    public string Name { get; set; }
+    public string Name { get; set; } = string.Empty;
     public int Goals { get; set; }
 }
diff --git a/AspNetCoreServiceBusApi2/AspNetCoreServiceBusApi2.csproj b/AspNetCoreServiceBusApi2/AspNetCoreServiceBusApi2.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <UserSecretsId>bfddc4ca-4c84-4591-9b6c-6bf6eda5705f</UserSecretsId>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/AspNetCoreServiceBusApi2/Model/Payload.cs b/AspNetCoreServiceBusApi2/Model/Payload.cs
@@ -6,7 +6,7 @@ public class Payload
 {
     [Key]
     public int Id { get; set; }
-    public string Name { get; set; }
+    public string Name { get; set; } = string.Empty;
     public int Goals { get; set; }
     public DateTime Created { get; set; }
 }
diff --git a/AspNetCoreServiceBusApi2/Model/PayloadMessageContext.cs b/AspNetCoreServiceBusApi2/Model/PayloadMessageContext.cs
@@ -4,7 +4,7 @@ namespace AspNetCoreServiceBusApi2.Model;
 
 public class PayloadMessageContext : DbContext
 {
-    private string _connectionString;
+    private readonly string _connectionString;
 
     public DbSet<Payload> Payloads { get; set; }
 
diff --git a/AspNetCoreServiceBusApi2/ProcessData.cs b/AspNetCoreServiceBusApi2/ProcessData.cs
@@ -5,26 +5,26 @@ namespace AspNetCoreServiceBusApi2;
 
 public class ProcessData : IProcessData
 {
-    private IConfiguration _configuration;
+    private readonly IConfiguration _configuration;
 
     public ProcessData(IConfiguration configuration)
     {
         _configuration = configuration;
     }
+
     public async Task Process(MyPayload myPayload)
     {
-        using (var payloadMessageContext =
-            new PayloadMessageContext(
-                _configuration.GetConnectionString("DefaultConnection")))
+        var connection = _configuration.GetConnectionString("DefaultConnection");
+        if(connection == null) throw new ArgumentNullException(nameof(connection));
+
+        using var payloadMessageContext = new PayloadMessageContext(connection);
+        await payloadMessageContext.AddAsync(new Payload
         {
-            await payloadMessageContext.AddAsync(new Payload
-            {
-                Name = myPayload.Name,
-                Goals = myPayload.Goals,
-                Created = DateTime.UtcNow
-            }).ConfigureAwait(false);
+            Name = myPayload.Name,
+            Goals = myPayload.Goals,
+            Created = DateTime.UtcNow
+        }).ConfigureAwait(false);
 
-            await payloadMessageContext.SaveChangesAsync().ConfigureAwait(false);
-        }
+        await payloadMessageContext.SaveChangesAsync().ConfigureAwait(false);
     }
 }
diff --git a/AspNetCoreServiceBusApi2/payloads.sqlite b/AspNetCoreServiceBusApi2/payloads.sqlite
diff --git a/FunctionService3/FunctionService3.csproj b/FunctionService3/FunctionService3.csproj
@@ -4,6 +4,7 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <UserSecretsId>347b70ab-6834-45be-8c47-9036a70d52b7</UserSecretsId>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
diff --git a/FunctionService3/MyPayload.cs b/FunctionService3/MyPayload.cs
@@ -2,7 +2,7 @@
 
 public class MyPayload
 {
-    public string Name { get; set; }
+    public string Name { get; set; } = string.Empty;
     public int Goals { get; set; }
     public bool Delete { get; set; }
 }
diff --git a/ReducedAccessRightsQueueSender/Program.cs b/ReducedAccessRightsQueueSender/Program.cs
@@ -4,17 +4,17 @@ namespace ReducedAccessRightsQueueSender;
 
 class Program
 {
-    private static string ConnectionStringQueueBus = "your connection string";
-    private static ServiceBusClient _client;
-    private static ServiceBusSender _clientSender;
+    private static readonly string ConnectionStringQueueBus = "your connection string";
+    private static ServiceBusClient? _client;
+    private static ServiceBusSender? _clientSender;
 
     static async Task Main(string[] args)
     {
         _client = new ServiceBusClient(ConnectionStringQueueBus);
         _clientSender = _client.CreateSender("myqueue");
 
         //string messagePayload = JsonSerializer.Serialize(payload);
-        ServiceBusMessage message = new ServiceBusMessage("some message from somewhere");
+        var message = new ServiceBusMessage("some message from somewhere");
         await _clientSender.SendMessageAsync(message).ConfigureAwait(false);
     }
 }
diff --git a/ReducedAccessRightsQueueSender/ReducedAccessRightsQueueSender.csproj b/ReducedAccessRightsQueueSender/ReducedAccessRightsQueueSender.csproj
@@ -4,6 +4,7 @@
 	<OutputType>Exe</OutputType>
 	<TargetFramework>net7.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
+	<Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ServiceBusMessaging/MyPayload.cs b/ServiceBusMessaging/MyPayload.cs
@@ -2,7 +2,7 @@
 
 public class MyPayload
 {
-    public string Name { get; set; }
+    public string Name { get; set; } = string.Empty;
     public int Goals { get; set; }
     public bool Delete { get; set; }
 }
diff --git a/ServiceBusMessaging/ServiceBusConsumer.cs b/ServiceBusMessaging/ServiceBusConsumer.cs
@@ -18,7 +18,7 @@ public class ServiceBusConsumer : IServiceBusConsumer
     private readonly ServiceBusClient _client;
     private const string QUEUE_NAME = "simplequeue";
     private readonly ILogger _logger;
-    private ServiceBusProcessor _processor;
+    private ServiceBusProcessor? _processor = null;
 
     public ServiceBusConsumer(IProcessData processData,
         IConfiguration configuration,
@@ -34,7 +34,7 @@ public ServiceBusConsumer(IProcessData processData,
 
     public async Task RegisterOnMessageHandlerAndReceiveMessages()
     {
-        ServiceBusProcessorOptions _serviceBusProcessorOptions = new ServiceBusProcessorOptions
+        var _serviceBusProcessorOptions = new ServiceBusProcessorOptions
         {
             MaxConcurrentCalls = 1,
             AutoCompleteMessages = false,
@@ -49,9 +49,9 @@ public async Task RegisterOnMessageHandlerAndReceiveMessages()
     private Task ProcessErrorAsync(ProcessErrorEventArgs arg)
     {
         _logger.LogError(arg.Exception, "Message handler encountered an exception");
-        _logger.LogDebug($"- ErrorSource: {arg.ErrorSource}");
-        _logger.LogDebug($"- Entity Path: {arg.EntityPath}");
-        _logger.LogDebug($"- FullyQualifiedNamespace: {arg.FullyQualifiedNamespace}");
+        _logger.LogDebug("- ErrorSource: {ErrorSource}", arg.ErrorSource);
+        _logger.LogDebug("- Entity Path: {EntityPath}", arg.EntityPath);
+        _logger.LogDebug("- FullyQualifiedNamespace: {FullyQualifiedNamespace}", arg.FullyQualifiedNamespace);
 
         return Task.CompletedTask;
     }
@@ -78,6 +78,6 @@ public async ValueTask DisposeAsync()
 
     public async Task CloseQueueAsync()
     {
-        await _processor.CloseAsync().ConfigureAwait(false);
+        await _processor!.CloseAsync().ConfigureAwait(false);
     }
 }
diff --git a/ServiceBusMessaging/ServiceBusMessaging.csproj b/ServiceBusMessaging/ServiceBusMessaging.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ServiceBusMessaging/ServiceBusSender.cs b/ServiceBusMessaging/ServiceBusSender.cs
@@ -20,7 +20,7 @@ public ServiceBusSender(IConfiguration configuration)
     public async Task SendMessage(MyPayload payload)
     {
         string messagePayload = JsonSerializer.Serialize(payload);
-        ServiceBusMessage message = new ServiceBusMessage(messagePayload);
+        var message = new ServiceBusMessage(messagePayload);
         await _clientSender.SendMessageAsync(message).ConfigureAwait(false);
     }
 }
diff --git a/ServiceBusMessaging/ServiceBusTopicSender.cs b/ServiceBusMessaging/ServiceBusTopicSender.cs
@@ -25,7 +25,7 @@ public ServiceBusTopicSender(IConfiguration configuration,
     public async Task SendMessage(MyPayload payload)
     {
         string messagePayload = JsonSerializer.Serialize(payload);
-        ServiceBusMessage message = new ServiceBusMessage(messagePayload);
+        var message = new ServiceBusMessage(messagePayload);
 
         message.ApplicationProperties.Add("goals", payload.Goals);
 
diff --git a/ServiceBusMessaging/ServiceBusTopicSubscription.cs b/ServiceBusMessaging/ServiceBusTopicSubscription.cs
@@ -15,7 +15,7 @@ public class ServiceBusTopicSubscription : IServiceBusTopicSubscription
     private readonly ILogger _logger;
     private readonly ServiceBusClient _client;
     private readonly ServiceBusAdministrationClient _adminClient;
-    private ServiceBusProcessor _processor;
+    private ServiceBusProcessor? _processor = null;
 
     public ServiceBusTopicSubscription(IProcessData processData,
         IConfiguration configuration,
@@ -32,7 +32,7 @@ public ServiceBusTopicSubscription(IProcessData processData,
 
     public async Task PrepareFiltersAndHandleMessages()
     {
-        ServiceBusProcessorOptions _serviceBusProcessorOptions = new ServiceBusProcessorOptions
+        var _serviceBusProcessorOptions = new ServiceBusProcessorOptions
         {
             MaxConcurrentCalls = 1,
             AutoCompleteMessages = false,
@@ -70,7 +70,7 @@ await _adminClient.DeleteRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, "GoalsGreaterT
         }
         catch (Exception ex)
         {
-            _logger.LogWarning(ex.ToString());
+            _logger.LogError("{ex}", ex.ToString());
         }
     }
 
@@ -89,7 +89,7 @@ private async Task AddFilters()
 
             if (!ruleProperties.Any(r => r.Name == "GoalsGreaterThanSeven"))
             {
-                CreateRuleOptions createRuleOptions = new CreateRuleOptions
+                var createRuleOptions = new CreateRuleOptions
                 {
                     Name = "GoalsGreaterThanSeven",
                     Filter = new SqlRuleFilter("goals > 7")
@@ -100,7 +100,7 @@ await _adminClient.CreateRuleAsync(TOPIC_PATH, SUBSCRIPTION_NAME, createRuleOpti
         }
         catch (Exception ex)
         {
-            _logger.LogWarning(ex.ToString());
+            _logger.LogWarning("{ex}", ex.ToString());
         }
     }
 
@@ -114,9 +114,9 @@ private async Task ProcessMessagesAsync(ProcessMessageEventArgs args)
     private Task ProcessErrorAsync(ProcessErrorEventArgs arg)
     {
         _logger.LogError(arg.Exception, "Message handler encountered an exception");
-        _logger.LogDebug($"- ErrorSource: {arg.ErrorSource}");
-        _logger.LogDebug($"- Entity Path: {arg.EntityPath}");
-        _logger.LogDebug($"- FullyQualifiedNamespace: {arg.FullyQualifiedNamespace}");
+        _logger.LogDebug("- ErrorSource: {ErrorSource}", arg.ErrorSource);
+        _logger.LogDebug("- Entity Path: {EntityPath}", arg.EntityPath);
+        _logger.LogDebug("- FullyQualifiedNamespace: {FullyQualifiedNamespace}", arg.FullyQualifiedNamespace);
 
         return Task.CompletedTask;
     }
@@ -136,6 +136,6 @@ public async ValueTask DisposeAsync()
 
     public async Task CloseSubscriptionAsync()
     {
-        await _processor.CloseAsync().ConfigureAwait(false);
+        await _processor!.CloseAsync().ConfigureAwait(false);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace AspNetCoreServiceBusApi1.Controllers;`
`9`	`9`	`[ApiController]`
`10`	`10`	`public class PayloadController : Controller`
`11`	`11`	`{`
`12`		`- private ServiceBusSender _serviceBusSender;`
	`12`	`+ private readonly ServiceBusSender _serviceBusSender;`
`13`	`13`
`14`	`14`	`public PayloadController(ServiceBusSender serviceBusSender)`
`15`	`15`	`{`
`@@ -128,7 +128,7 @@ await _serviceBusSender.SendMessage(new MyPayload`
`128`	`128`	`return Ok();`
`129`	`129`	`}`
`130`	`130`
`131`		`- private static readonly List<Payload> data = new List<Payload>`
	`131`	`+ private static readonly List<Payload> data = new()`
`132`	`132`	`{`
`133`	`133`	`new Payload{ Id=1, Goals=3, Name="wow"},`
`134`	`134`	`new Payload{ Id=2, Goals=4, Name="not so bad"},`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ await _serviceBusTopicSender.SendMessage(new MyPayload`
`128`	`128`	`return Ok();`
`129`	`129`	`}`
`130`	`130`
`131`		`- private static readonly List<Payload> data = new List<Payload>`
	`131`	`+ private static readonly List<Payload> data = new()`
`132`	`132`	`{`
`133`	`133`	`new Payload{ Id=1, Goals=3, Name="wow"},`
`134`	`134`	`new Payload{ Id=2, Goals=4, Name="not so bad"},`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`public class Payload`
`4`	`4`	`{`
`5`	`5`	`public int Id { get; set; }`
`6`		`- public string Name { get; set; }`
	`6`	`+ public string Name { get; set; } = string.Empty;`
`7`	`7`	`public int Goals { get; set; }`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class Payload`
`6`	`6`	`{`
`7`	`7`	`[Key]`
`8`	`8`	`public int Id { get; set; }`
`9`		`- public string Name { get; set; }`
	`9`	`+ public string Name { get; set; } = string.Empty;`
`10`	`10`	`public int Goals { get; set; }`
`11`	`11`	`public DateTime Created { get; set; }`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace AspNetCoreServiceBusApi2.Model;`
`4`	`4`
`5`	`5`	`public class PayloadMessageContext : DbContext`
`6`	`6`	`{`
`7`		`- private string _connectionString;`
	`7`	`+ private readonly string _connectionString;`
`8`	`8`
`9`	`9`	`public DbSet<Payload> Payloads { get; set; }`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,26 +5,26 @@ namespace AspNetCoreServiceBusApi2;`
`5`	`5`
`6`	`6`	`public class ProcessData : IProcessData`
`7`	`7`	`{`
`8`		`- private IConfiguration _configuration;`
	`8`	`+ private readonly IConfiguration _configuration;`
`9`	`9`
`10`	`10`	`public ProcessData(IConfiguration configuration)`
`11`	`11`	`{`
`12`	`12`	`_configuration = configuration;`
`13`	`13`	`}`
	`14`	`+`
`14`	`15`	`public async Task Process(MyPayload myPayload)`
`15`	`16`	`{`
`16`		`- using (var payloadMessageContext =`
`17`		`- new PayloadMessageContext(`
`18`		`- _configuration.GetConnectionString("DefaultConnection")))`
	`17`	`+ var connection = _configuration.GetConnectionString("DefaultConnection");`
	`18`	`+ if(connection == null) throw new ArgumentNullException(nameof(connection));`
	`19`	`+`
	`20`	`+ using var payloadMessageContext = new PayloadMessageContext(connection);`
	`21`	`+ await payloadMessageContext.AddAsync(new Payload`
`19`	`22`	`{`
`20`		`- await payloadMessageContext.AddAsync(new Payload`
`21`		`- {`
`22`		`- Name = myPayload.Name,`
`23`		`- Goals = myPayload.Goals,`
`24`		`- Created = DateTime.UtcNow`
`25`		`- }).ConfigureAwait(false);`
	`23`	`+ Name = myPayload.Name,`
	`24`	`+ Goals = myPayload.Goals,`
	`25`	`+ Created = DateTime.UtcNow`
	`26`	`+ }).ConfigureAwait(false);`
`26`	`27`
`27`		`- await payloadMessageContext.SaveChangesAsync().ConfigureAwait(false);`
`28`		`- }`
	`28`	`+ await payloadMessageContext.SaveChangesAsync().ConfigureAwait(false);`
`29`	`29`	`}`
`30`	`30`	`}`