Fix all warnings (#449)

* Clean up 50+ warnings in code. Mostly nullability types. Also fixed some bugs found in process. * Put upload file code into application handler * Small nullability fixes * More null reference * Fix from comment * Remove unused method * Remove unused dependencies * More nullability fix * More showed up * Use fgile scoped namespace consistently
Altinn · May 23, 2024 · 0305ff1 · 0305ff1
1 parent 46c77a6
commit 0305ff1
Show file tree

Hide file tree

Showing 72 changed files with 1,108 additions and 1,193 deletions.
diff --git a/.azure/modules/containerAppEnvironment/main.bicep b/.azure/modules/containerAppEnvironment/main.bicep
@@ -57,7 +57,7 @@ resource application_insights_action 'Microsoft.Insights/actionGroups@2023-01-01
       ]
     }
   }
-resource exceptionOccuredAlertRule 'Microsoft.Insights/scheduledQueryRules@2023-12-01' =
+resource exceptionOccuredAlertRule 'Microsoft.Insights/scheduledQueryRules@2023-03-15-preview' =
   if (emailReceiver != null && emailReceiver != '') {
     name: '${namePrefix}-500-exception-occured'
     location: location

diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml
@@ -110,7 +110,7 @@ jobs:
       hasMigrationChanges: ${{ needs.check-for-changes.outputs.hasMigrationChanges }}
 
   release-to-git:  
-    name: release to git
+    name: Release to git
     runs-on: ubuntu-latest
     needs: [check-for-changes, deploy-production]
     if: ${{ needs.check-for-changes.outputs.hasBackendChanges == 'true' && !failure() && !cancelled()}}

diff --git a/Test/Altinn.Broker.Tests/Helpers/CustomWebApplicationFactory.cs b/Test/Altinn.Broker.Tests/Helpers/CustomWebApplicationFactory.cs
@@ -40,7 +40,7 @@ protected override void ConfigureWebHost(
                 ((IList<AuthenticationSchemeBuilder>)o.Schemes).Clear();
             });
             services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
-                .AddJwtBearer(async options =>
+                .AddJwtBearer(options =>
                 {
                     options.RequireHttpsMetadata = false;
                     options.SaveToken = true;

diff --git a/Test/Altinn.Broker.Tests/LegacyFileControllerTests.cs b/Test/Altinn.Broker.Tests/LegacyFileControllerTests.cs
@@ -10,7 +10,6 @@
 using Altinn.Broker.Models;
 using Altinn.Broker.Tests.Factories;
 using Altinn.Broker.Tests.Helpers;
-
 using Xunit;
 
 namespace Altinn.Broker.Tests;
@@ -90,10 +89,11 @@ public async Task GetFiles_GetByMultipleRecipient_Success()
 
         var textResponse = await getResponse.Content.ReadAsStringAsync();
 
-        var result = await getResponse.Content.ReadAsAsync<List<Guid>>();
+        var result = await getResponse.Content.ReadFromJsonAsync<List<Guid>>(_responseSerializerOptions);
 
         // Assert        
         Assert.Equal(HttpStatusCode.OK, getResponse.StatusCode);
+        Assert.NotNull(result);
         Assert.Contains(Guid.Parse(fileId), result);
     }
 
@@ -154,10 +154,11 @@ public async Task GetFiles_GetByMultipleRecipient_Recipient1_Success()
         + $"&resourceId={file.ResourceId}"
         + $"&recipients={file.Recipients[0]}");
 
-        var result = await getResponse.Content.ReadAsAsync<List<Guid>>();
+        var result = await getResponse.Content.ReadFromJsonAsync<List<Guid>>(_responseSerializerOptions);
 
         // Assert        
         Assert.Equal(System.Net.HttpStatusCode.OK, getResponse.StatusCode);
+        Assert.NotNull(result);
         Assert.Contains(Guid.Parse(fileId), result);
     }
 
@@ -188,10 +189,11 @@ public async Task GetFiles_GetByMultipleRecipient_Recipient2_Success()
         + $"&resourceId={file.ResourceId}"
         + $"&recipients={file.Recipients[1]}");
 
-        var result = await getResponse.Content.ReadAsAsync<List<Guid>>();
+        var result = await getResponse.Content.ReadFromJsonAsync<List<Guid>>(_responseSerializerOptions);
 
         // Assert        
         Assert.Equal(HttpStatusCode.OK, getResponse.StatusCode);
+        Assert.NotNull(result);
         Assert.Contains(Guid.Parse(fileId), result);
     }
 
@@ -221,11 +223,11 @@ public async Task GetFiles_GetBySingleRecipient_Success()
         + $"&from={HttpUtility.UrlEncode(from.UtcDateTime.ToString("o"))}&to={HttpUtility.UrlEncode(to.UtcDateTime.ToString("o"))}"
         + $"&resourceId={file.ResourceId}"
         + $"&onBehalfOfConsumer={file.Recipients[0]}");
-        var result = await getResponse.Content.ReadAsAsync<List<Guid>>();
+        var result = await getResponse.Content.ReadFromJsonAsync<List<Guid>>(_responseSerializerOptions);
 
         // Assert        
         Assert.Equal(HttpStatusCode.OK, getResponse.StatusCode);
-        Assert.Contains(Guid.Parse(fileId), result);
+        Assert.Contains(Guid.Parse(fileId), result!);
     }
 
     [Fact]
@@ -262,13 +264,13 @@ public async Task GetFiles_GetInitializedAndDownloadStarted_Success()
         + $"&resourceId={file.ResourceId}"
         + $"&onBehalfOfConsumer={file.Recipients[1]}");
 
-        var result_recip1 = await getResponse_rep1.Content.ReadAsAsync<List<Guid>>();
-        var result_recip2 = await getResponse_rep2.Content.ReadAsAsync<List<Guid>>();
+        var result_recip1 = await getResponse_rep1.Content.ReadFromJsonAsync<List<Guid>>(_responseSerializerOptions);
+        var result_recip2 = await getResponse_rep2.Content.ReadFromJsonAsync<List<Guid>>(_responseSerializerOptions);
 
         // Assert        
         Assert.Equal(HttpStatusCode.OK, getResponse_rep1.StatusCode);
-        Assert.Contains(Guid.Parse(fileId), result_recip1);
-        Assert.Contains(Guid.Parse(fileId), result_recip2);
+        Assert.Contains(Guid.Parse(fileId), result_recip1!);
+        Assert.Contains(Guid.Parse(fileId), result_recip2!);
     }
 
     [Fact]
@@ -291,10 +293,11 @@ public async Task GetFileOverview_SentByA3Sender_Success()
 
         // Act
         var getResponse = await _legacyClient.GetAsync($"broker/api/legacy/v1/file/{fileId}?onBehalfOfConsumer={file.Recipients[0]}");
-        var fileData = await getResponse.Content.ReadAsAsync<LegacyFileOverviewExt>();
+        var fileData = await getResponse.Content.ReadFromJsonAsync<LegacyFileOverviewExt>(_responseSerializerOptions);
 
         // Assert        
         Assert.Equal(System.Net.HttpStatusCode.OK, getResponse.StatusCode);
+        Assert.NotNull(fileData);
         Assert.Equal(fileId, fileData.FileId.ToString());
     }
 
@@ -339,10 +342,11 @@ public async Task GetFileOverview_2FilesInitiated_1Published_StandardRequestRetr
         + $"&resourceId={file.ResourceId}"
         + $"&onBehalfOfConsumer={file.Recipients[0]}");
         string s = await getResponse.Content.ReadAsStringAsync();
-        List<Guid> fileData = await getResponse.Content.ReadAsAsync<List<Guid>>();
+        var fileData = await getResponse.Content.ReadFromJsonAsync<List<Guid>>(_responseSerializerOptions);
 
         // Assert        
         Assert.Equal(System.Net.HttpStatusCode.OK, getResponse.StatusCode);
+        Assert.NotNull(fileData);
         Assert.Contains(fileData, g => g == Guid.Parse(fileId1));
         Assert.DoesNotContain(fileData, g => g == Guid.Parse(fileId2));
     }
@@ -413,7 +417,7 @@ public async Task Download_ConfirmDownloaded_Success()
         // Act
         var getResponse = await _legacyClient.PostAsync($"broker/api/legacy/v1/file/{fileId}/confirmdownload?onBehalfOfConsumer={file.Recipients[0]}", null);
         var statusResponse = await _legacyClient.GetAsync($"broker/api/legacy/v1/file/{fileId}?onBehalfOfConsumer={file.Recipients[0]}");
-        var result = await statusResponse.Content.ReadAsAsync<LegacyFileOverviewExt>();
+        var result = await statusResponse.Content.ReadFromJsonAsync<LegacyFileOverviewExt>(_responseSerializerOptions);
 
         Assert.Equal(HttpStatusCode.OK, getResponse.StatusCode);
         Assert.Equal(HttpStatusCode.OK, statusResponse.StatusCode);

diff --git a/Test/Altinn.Broker.Tests/ServiceOwnerControllerTests.cs b/Test/Altinn.Broker.Tests/ServiceOwnerControllerTests.cs
@@ -28,6 +28,6 @@ public ServiceOwnerControllerTests(CustomWebApplicationFactory factory)
     public async Task Get_ServiceOwner()
     {
         var response = await _serviceOwnerClient.GetFromJsonAsync<ServiceOwnerOverviewExt>($"broker/api/v1/serviceowner", _responseSerializerOptions);
-        Assert.Equal("Digitaliseringsdirektoratet Avd Oslo", response.Name);
+        Assert.Equal("Digitaliseringsdirektoratet Avd Oslo", response!.Name);
     }
 }
diff --git a/src/Altinn.Broker.API/Altinn.Broker.API.csproj b/src/Altinn.Broker.API/Altinn.Broker.API.csproj
@@ -12,8 +12,7 @@
     <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
     <PackageReference Include="Hangfire.AspNetCore" Version="1.8.12" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.1" />
-    <PackageReference Include="Hangfire.PostgreSql" Version="1.20.8" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />     
+    <PackageReference Include="Hangfire.PostgreSql" Version="1.20.8" />     
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.5" />