fixed code smells from sonarcloud #GCPActive

.github/workflows/build-and-analyze.yml

@@ -63,7 +63,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          dotnet-sonarscanner begin /k:"Altinn_altinn-notifications" /o:"altinn" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="**/coverage.opencover.xml" /d:sonar.cpd.exclusions="src/Altinn.Notifications.Persistence/Migration/**/*.sql" /d:sonar.coverage.exclusions="src/Altinn.Notifications.Persistence/Migration/"
+          dotnet-sonarscanner begin /k:"Altinn_altinn-notifications" /o:"altinn" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="**/coverage.opencover.xml" /d:sonar.exclusions="src/Altinn.Notifications.Persistence/Migration/**/*"
 
           dotnet build Altinn.Notifications.sln -v q
 

src/Altinn.Notifications.Core/JsonSerializerOptionsProvider.cs

@@ -0,0 +1,21 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Altinn.Notifications.Core
+{
+    /// <summary>
+    /// Provider class for JsonSerializerOptions
+    /// </summary>
+    public static class JsonSerializerOptionsProvider
+    {
+        /// <summary>
+        /// Standard serializer options
+        /// </summary>
+        public static JsonSerializerOptions Options { get; } = new()
+        {
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            Converters = { new JsonStringEnumConverter() }
+        };
+    }
+}

src/Altinn.Notifications.Core/Models/Email.cs

@@ -1,5 +1,4 @@
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 using Altinn.Notifications.Core.Enums;
 
@@ -58,13 +57,6 @@ public Email(Guid notificationId, string subject, string body, string fromAddres
     /// </summary>
     public string Serialize()
     {
-        return JsonSerializer.Serialize(
-            this,
-            new JsonSerializerOptions
-            {
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                Converters = { new JsonStringEnumConverter() }
-            });
+        return JsonSerializer.Serialize(this, JsonSerializerOptionsProvider.Options);
     }
 }

src/Altinn.Notifications.Core/Models/Notification/SendOperationResult.cs

@@ -1,13 +1,12 @@
 using System.Text.Json;
-using System.Text.Json.Serialization;
+
 using Altinn.Notifications.Core.Enums;
-using Altinn.Notifications.Core.Models.Orders;
 
 namespace Altinn.Notifications.Core.Models.Notification;
 
 /// <summary>
 /// A class representing a send operation update object
-/// </summary>
+/// </summary>                              
 public class SendOperationResult
 {
     /// <summary>
@@ -30,14 +29,7 @@ public class SendOperationResult
     /// </summary>
     public string Serialize()
     {
-        return JsonSerializer.Serialize(
-            this,
-            new JsonSerializerOptions
-            {
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                Converters = { new JsonStringEnumConverter() }
-            });
+        return JsonSerializer.Serialize(this, JsonSerializerOptionsProvider.Options);
     }
 
     /// <summary>
@@ -46,12 +38,7 @@ public string Serialize()
     public static SendOperationResult? Deserialize(string serializedString)
     {
         return JsonSerializer.Deserialize<SendOperationResult>(
-            serializedString,
-            new JsonSerializerOptions()
-            {
-                PropertyNameCaseInsensitive = true,
-                Converters = { new JsonStringEnumConverter() }
-            });
+            serializedString, JsonSerializerOptionsProvider.Options);
     }
 
     /// <summary>

src/Altinn.Notifications.Core/Models/Orders/NotificationOrder.cs

@@ -1,5 +1,4 @@
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 using Altinn.Notifications.Core.Enums;
 using Altinn.Notifications.Core.Models.NotificationTemplate;
@@ -42,7 +41,7 @@
     /// <summary>
     /// Initializes a new instance of the <see cref="NotificationOrder"/> class.
     /// </summary>
     public NotificationOrder(Guid id, string? sendersReference, List<INotificationTemplate> templates, DateTime requestedSendTime, NotificationChannel notificationChannel, Creator creator, DateTime created, List<Recipient> recipients)
     {
         Id = id;
         SendersReference = sendersReference;
@@ -67,28 +66,15 @@
     /// </summary>
     public string Serialize()
     {
-        return JsonSerializer.Serialize(
-            this,
-            new JsonSerializerOptions
-            {
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                Converters = { new JsonStringEnumConverter() }
-            });
+        return JsonSerializer.Serialize(this, JsonSerializerOptionsProvider.Options);
     }
 
     /// <summary>
     /// Deserialize a json string into the <see cref="NotificationOrder"/>
     /// </summary>
     public static NotificationOrder? Deserialize(string serializedString)
     {
-        return JsonSerializer.Deserialize<NotificationOrder>(
-            serializedString,
-            new JsonSerializerOptions()
-            {
-                PropertyNameCaseInsensitive = true,
-                Converters = { new JsonStringEnumConverter() }
-            });
+        return JsonSerializer.Deserialize<NotificationOrder>(serializedString, JsonSerializerOptionsProvider.Options);
     }
 
     /// <summary>

src/Altinn.Notifications.Core/Services/NotificationSummaryService.cs

@@ -49,7 +49,7 @@ public NotificationSummaryService(INotificationSummaryRepository summaryReposito
                 return (null, new ServiceError(404));
             }
 
-            if (summary.Notifications.Any())
+            if (summary.Notifications.Count != 0)
             {
                 ProcessNotificationResults(summary);
             }

src/Altinn.Notifications/Mappers/OrderMapper.cs

@@ -84,7 +84,7 @@ public static NotificationOrderWithStatusExt MapToNotificationOrderWithStatusExt
             StatusDescription = order.ProcessingStatus.StatusDescription
         };
 
-        if (order.NotificationStatuses.Any())
+        if (order.NotificationStatuses.Count != 0)
         {
             orderExt.NotificationsStatusSummary = new();
             foreach (var entry in order.NotificationStatuses)

src/Altinn.Notifications/Program.cs

@@ -1,4 +1,4 @@
 #nullable disable
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -80,7 +80,7 @@
 {
     var logFactory = LoggerFactory.Create(builder =>
     {
         builder
             .AddFilter("Altinn.Platform.Notifications.Program", LogLevel.Debug)
             .AddConsole();
     });
@@ -119,7 +119,7 @@
         // If not application insight is available log to console
         logging.AddFilter("Microsoft", LogLevel.Warning);
         logging.AddFilter("System", LogLevel.Warning);
         logging.AddConsole();
     }
 }
 
@@ -140,7 +140,7 @@
     services.AddSingleton(config);
     if (!string.IsNullOrEmpty(applicationInsightsConnectionString))
     {
         services.AddSingleton(typeof(ITelemetryChannel), new ServerTelemetryChannel() { StorageFolder = "/tmp/logtelemetry" });
 
         services.AddApplicationInsightsTelemetry(new ApplicationInsightsServiceOptions
         {
@@ -187,13 +187,11 @@
 
 void AddAuthorizationRulesAndHandlers(IServiceCollection services, IConfiguration config)
 {
-    services.AddAuthorization(options =>
-    {
-        options.AddPolicy(AuthorizationConstants.POLICY_CREATE_SCOPE_OR_PLATFORM_ACCESS, policy =>
+    services.AddAuthorizationBuilder()
+        .AddPolicy(AuthorizationConstants.POLICY_CREATE_SCOPE_OR_PLATFORM_ACCESS, policy =>
         {
             policy.Requirements.Add(new CreateScopeOrAccessTokenRequirement(AuthorizationConstants.SCOPE_NOTIFICATIONS_CREATE));
         });
-    });
 
     services.AddTransient<IAuthorizationHandler, ScopeAccessHandler>();
 

test/Altinn.Notifications.IntegrationTests/Notifications/OrdersController/GetByIdTests.cs

@@ -1,9 +1,9 @@
 using System.Net;
 using System.Net.Http.Headers;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 using Altinn.Common.AccessToken.Services;
+using Altinn.Notifications.Core;
 using Altinn.Notifications.Core.Models.Orders;
 using Altinn.Notifications.IntegrationTests.Utils;
 using Altinn.Notifications.Mappers;
@@ -93,7 +93,7 @@ public async Task GetById_SingleMatchInDb_ReturnsOk()
         // Act
         HttpResponseMessage response = await client.SendAsync(httpRequestMessage);
         string resString = await response.Content.ReadAsStringAsync();
-        NotificationOrderExt? actual = JsonSerializer.Deserialize<NotificationOrderExt>(resString, new JsonSerializerOptions { Converters = { new JsonStringEnumConverter() } });
+        NotificationOrderExt? actual = JsonSerializer.Deserialize<NotificationOrderExt>(resString, JsonSerializerOptionsProvider.Options);
 
         // Assert
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);

test/Altinn.Notifications.IntegrationTests/Notifications/OrdersController/GetBySendersRefTests.cs

@@ -1,9 +1,9 @@
 using System.Net;
 using System.Net.Http.Headers;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 using Altinn.Common.AccessToken.Services;
+using Altinn.Notifications.Core;
 using Altinn.Notifications.Core.Models.Orders;
 using Altinn.Notifications.IntegrationTests.Utils;
 using Altinn.Notifications.Models;
@@ -49,7 +49,7 @@ public async Task GetBySendersRef_NoMatchInDb_ReturnsOK_EmptyList()
         // Act
         HttpResponseMessage response = await client.SendAsync(httpRequestMessage);
         string resString = await response.Content.ReadAsStringAsync();
-        NotificationOrderListExt actual = JsonSerializer.Deserialize<NotificationOrderListExt>(resString, new JsonSerializerOptions { Converters = { new JsonStringEnumConverter() } })!;
+        NotificationOrderListExt actual = JsonSerializer.Deserialize<NotificationOrderListExt>(resString, JsonSerializerOptionsProvider.Options)!;
 
         // Assert
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -73,7 +73,7 @@ public async Task GetBySendersRef_SingleMatchInDb_ReturnsOk_SingleElementInlList
         // Act
         HttpResponseMessage response = await client.SendAsync(httpRequestMessage);
         string resString = await response.Content.ReadAsStringAsync();
-        NotificationOrderListExt actual = JsonSerializer.Deserialize<NotificationOrderListExt>(resString, new JsonSerializerOptions { Converters = { new JsonStringEnumConverter() } })!;
+        NotificationOrderListExt actual = JsonSerializer.Deserialize<NotificationOrderListExt>(resString, JsonSerializerOptionsProvider.Options)!;
 
         // Assert
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -100,7 +100,7 @@ public async Task GetBySendersRef_MultipleMatchInDb_ReturnsOk_MultipleElementInl
         // Act
         HttpResponseMessage response = await client.SendAsync(httpRequestMessage);
         string resString = await response.Content.ReadAsStringAsync();
-        NotificationOrderListExt actual = JsonSerializer.Deserialize<NotificationOrderListExt>(resString, new JsonSerializerOptions { Converters = { new JsonStringEnumConverter() } })!;
+        NotificationOrderListExt actual = JsonSerializer.Deserialize<NotificationOrderListExt>(resString, JsonSerializerOptionsProvider.Options)!;
 
         // Assert
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);

test/Altinn.Notifications.IntegrationTests/Notifications/OrdersController/GetWithStatusById.cs

@@ -1,9 +1,9 @@
 using System.Net;
 using System.Net.Http.Headers;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 using Altinn.Common.AccessToken.Services;
+using Altinn.Notifications.Core;
 using Altinn.Notifications.Core.Models.Orders;
 using Altinn.Notifications.IntegrationTests.Utils;
 using Altinn.Notifications.Models;
@@ -98,7 +98,7 @@ public async Task GetWithStatusById_SingleMatchInDbAndOneEmail_ReturnsOk()
         // Act
         HttpResponseMessage response = await client.SendAsync(httpRequestMessage);
         string resString = await response.Content.ReadAsStringAsync();
-        NotificationOrderWithStatusExt? actual = JsonSerializer.Deserialize<NotificationOrderWithStatusExt>(resString, new JsonSerializerOptions { Converters = { new JsonStringEnumConverter() } });
+        NotificationOrderWithStatusExt? actual = JsonSerializer.Deserialize<NotificationOrderWithStatusExt>(resString, JsonSerializerOptionsProvider.Options);
 
         // Assert
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
@@ -137,7 +137,7 @@ public async Task GetWithStatusById_SingleMatchInDb_ReturnsOk()
         // Act
         HttpResponseMessage response = await client.SendAsync(httpRequestMessage);
         string resString = await response.Content.ReadAsStringAsync();
-        NotificationOrderWithStatusExt? actual = JsonSerializer.Deserialize<NotificationOrderWithStatusExt>(resString, new JsonSerializerOptions { Converters = { new JsonStringEnumConverter() } });
+        NotificationOrderWithStatusExt? actual = JsonSerializer.Deserialize<NotificationOrderWithStatusExt>(resString, JsonSerializerOptionsProvider.Options);
 
         // Assert
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);

test/Altinn.Notifications.Tests/Notifications/Mocks/Authentication/JwtCookiePostConfigureOptionsStub.cs

@@ -1,5 +1,3 @@
-using System;
-
 using AltinnCore.Authentication.JwtCookie;
 
 using Microsoft.AspNetCore.Authentication.Cookies;
@@ -22,7 +20,7 @@ public void PostConfigure(string? name, JwtCookieOptions options)
 
         options.CookieManager ??= new ChunkingCookieManager();
 
-        if (!string.IsNullOrEmpty(options.MetadataAddress) && !options.MetadataAddress.EndsWith("/", StringComparison.Ordinal))
+        if (!string.IsNullOrEmpty(options.MetadataAddress) && !options.MetadataAddress.EndsWith('/'))
         {
             options.MetadataAddress += "/";
         }

test/Altinn.Notifications.Tests/Notifications/Mocks/Authentication/JwtTokenMock.cs

@@ -35,7 +35,7 @@ public static string GenerateToken(ClaimsPrincipal principal, TimeSpan tokenExip
         return tokenstring;
     }
 
-    private static SigningCredentials GetSigningCredentials(string issuer)
+    private static X509SigningCredentials GetSigningCredentials(string issuer)
     {
         string certPath = "jwtselfsignedcert.pfx";
         if (!issuer.Equals("UnitTest"))