cosmetic code changes (#287)

Altinn · Oct 25, 2023 · 3d3829f · 3d3829f
1 parent 19dc5df
commit 3d3829f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 50 deletions.
diff --git a/src/Altinn.Notifications.Core/Extensions/ServiceCollectionExtensions.cs b/src/Altinn.Notifications.Core/Extensions/ServiceCollectionExtensions.cs
@@ -20,19 +20,13 @@ public static class ServiceCollectionExtensions
     /// <param name="config">the configuration collection</param>
     public static void AddCoreServices(this IServiceCollection services, IConfiguration config)
     {
-        KafkaSettings? kafkaSettings = config.GetSection("KafkaSettings").Get<KafkaSettings>();
+        _ = config.GetSection("KafkaSettings")
+            .Get<KafkaSettings>()
+            ?? throw new ArgumentNullException(nameof(config), "Required KafkaSettings is missing from application configuration");
 
-        if (kafkaSettings == null)
-        {
-            throw new ArgumentNullException(nameof(config), "Required KafkaSettings is missing from application configuration");
-        }
-
-        NotificationOrderConfig? settings = config.GetSection("NotificationOrderConfig").Get<NotificationOrderConfig>();
-
-        if (settings == null)
-        {
-            throw new ArgumentNullException(nameof(config), "Required NotificationOrderConfig is missing from application configuration");
-        }
+        _ = config.GetSection("NotificationOrderConfig")
+            .Get<NotificationOrderConfig>()
+            ?? throw new ArgumentNullException(nameof(config), "Required NotificationOrderConfig is missing from application configuration");
 
         services
             .AddSingleton<IGuidService, GuidService>()

diff --git a/src/Altinn.Notifications.Integrations/Extensions/ServiceCollectionExtensions.cs b/src/Altinn.Notifications.Integrations/Extensions/ServiceCollectionExtensions.cs
@@ -21,12 +21,9 @@ public static class ServiceCollectionExtensions
     /// <param name="config">the configuration collection</param>
     public static void AddKafkaServices(this IServiceCollection services, IConfiguration config)
     {
-        KafkaSettings? kafkaSettings = config.GetSection(nameof(KafkaSettings)).Get<KafkaSettings>();
-
-        if (kafkaSettings == null)
-        {
-            throw new ArgumentNullException(nameof(config), "Required KafkaSettings is missing from application configuration");
-        }
+        _ = config.GetSection(nameof(KafkaSettings))
+            .Get<KafkaSettings>()
+            ?? throw new ArgumentNullException(nameof(config), "Required KafkaSettings is missing from application configuration");
 
         services
         .AddSingleton<IKafkaProducer, KafkaProducer>()
@@ -43,12 +40,10 @@ public static void AddKafkaServices(this IServiceCollection services, IConfigura
     /// <param name="config">the configuration collection</param>
     public static void AddKafkaHealthChecks(this IServiceCollection services, IConfiguration config)
     {
-        KafkaSettings kafkaSettings = config!.GetSection(nameof(KafkaSettings)).Get<KafkaSettings>()!;
-
-        if (kafkaSettings == null)
-        {
-            throw new ArgumentNullException(nameof(config), "Required KafkaSettings is missing from application configuration");
-        }
+        KafkaSettings kafkaSettings = config!
+            .GetSection(nameof(KafkaSettings))
+            .Get<KafkaSettings>()
+            ?? throw new ArgumentNullException(nameof(config), "Required KafkaSettings is missing from application configuration");
 
         services.AddHealthChecks()
         .AddCheck("notifications_kafka_health_check", new KafkaHealthCheck(kafkaSettings));

diff --git a/src/Altinn.Notifications.Integrations/Kafka/Consumers/EmailStatusConsumer.cs b/src/Altinn.Notifications.Integrations/Kafka/Consumers/EmailStatusConsumer.cs
@@ -3,8 +3,6 @@
 using Altinn.Notifications.Core.Services.Interfaces;
 using Altinn.Notifications.Integrations.Configuration;
 
-using Confluent.Kafka;
-
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 

diff --git a/src/Altinn.Notifications.Integrations/Kafka/Consumers/KafkaConsumerBase.cs b/src/Altinn.Notifications.Integrations/Kafka/Consumers/KafkaConsumerBase.cs
@@ -1,5 +1,4 @@
-using Altinn.Notifications.Core.Models.Orders;
-using Altinn.Notifications.Integrations.Configuration;
+using Altinn.Notifications.Integrations.Configuration;
 
 using Confluent.Kafka;
 
@@ -103,7 +102,7 @@ protected async Task ConsumeMessage(
                     _consumer.StoreOffset(consumeResult);
                 }
 
-                _logger.LogError(ex, "// {Class} // ConsumeOrder // An error occurred while consuming messages", GetType().Name);
+                _logger.LogError(ex, "// {Class} // ConsumeMessage // An error occurred while consuming messages", GetType().Name);
             }
         }
     }

diff --git a/src/Altinn.Notifications.Integrations/Kafka/Consumers/PastDueOrdersRetryConsumer.cs b/src/Altinn.Notifications.Integrations/Kafka/Consumers/PastDueOrdersRetryConsumer.cs
@@ -2,8 +2,6 @@
 using Altinn.Notifications.Core.Services.Interfaces;
 using Altinn.Notifications.Integrations.Configuration;
 
-using Confluent.Kafka;
-
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 

diff --git a/src/Altinn.Notifications.Persistence/Extensions/ServiceCollectionExtensions.cs b/src/Altinn.Notifications.Persistence/Extensions/ServiceCollectionExtensions.cs
@@ -5,7 +5,6 @@
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 using Npgsql;
 
@@ -23,12 +22,9 @@ public static class ServiceCollectionExtensions
     /// <param name="config">the configuration collection</param>
     public static IServiceCollection AddPostgresRepositories(this IServiceCollection services, IConfiguration config)
     {
-        PostgreSqlSettings? settings = config.GetSection("PostgreSQLSettings").Get<PostgreSqlSettings>();
-
-        if (settings == null)
-        {
-            throw new ArgumentNullException(nameof(config), "Required PostgreSQLSettings is missing from application configuration");
-        }
+        PostgreSqlSettings? settings = config.GetSection("PostgreSQLSettings")
+            .Get<PostgreSqlSettings>()
+            ?? throw new ArgumentNullException(nameof(config), "Required PostgreSQLSettings is missing from application configuration");
 
         string connectionString = string.Format(settings.ConnectionString, settings.NotificationsDbPwd);
 
@@ -45,12 +41,9 @@ public static IServiceCollection AddPostgresRepositories(this IServiceCollection
     /// <param name="config">the configuration collection</param>
     public static void AddPostgresHealthChecks(this IServiceCollection services, IConfiguration config)
     {
-        PostgreSqlSettings? settings = config.GetSection("PostgreSQLSettings").Get<PostgreSqlSettings>();
-
-        if (settings == null)
-        {
-            throw new ArgumentNullException(nameof(config), "Required PostgreSQLSettings is missing from application configuration");
-        }
+        PostgreSqlSettings? settings = config.GetSection("PostgreSQLSettings")
+            .Get<PostgreSqlSettings>()
+            ?? throw new ArgumentNullException(nameof(config), "Required PostgreSQLSettings is missing from application configuration");
 
         string connectionString = string.Format(settings.ConnectionString, settings.NotificationsDbPwd);
 

diff --git a/src/Altinn.Notifications.Persistence/Extensions/WebApplicationExtensions.cs b/src/Altinn.Notifications.Persistence/Extensions/WebApplicationExtensions.cs
@@ -21,12 +21,9 @@ public static class WebApplicationExtensions
     /// <param name="config">the configuration collection</param>
     public static void SetUpPostgreSql(this IApplicationBuilder app, bool isDevelopment, IConfiguration config)
     {
-        PostgreSqlSettings? settings = config.GetSection("PostgreSQLSettings").Get<PostgreSqlSettings>();
-
-        if (settings == null)
-        {
-            throw new ArgumentNullException(nameof(config), "Required PostgreSQLSettings is missing from application configuration");
-        }
+        PostgreSqlSettings? settings = config.GetSection("PostgreSQLSettings")
+            .Get<PostgreSqlSettings>()
+            ?? throw new ArgumentNullException(nameof(config), "Required PostgreSQLSettings is missing from application configuration");
 
         if (settings.EnableDBConnection)
         {