Fix nullability warnings produced by .NET 6 with EF Core 6

Bart Koelman · Bart Koelman · commit 58ac1ecbce51 · 2021-11-18T23:49:39.000+01:00
diff --git a/src/JsonApiDotNetCore/Configuration/InverseNavigationResolver.cs b/src/JsonApiDotNetCore/Configuration/InverseNavigationResolver.cs
@@ -38,7 +38,7 @@ private void Resolve(DbContext dbContext)
         {
             foreach (ResourceType resourceType in _resourceGraph.GetResourceTypes().Where(resourceType => resourceType.Relationships.Any()))
             {
-                IEntityType entityType = dbContext.Model.FindEntityType(resourceType.ClrType);
+                IEntityType? entityType = dbContext.Model.FindEntityType(resourceType.ClrType);
 
                 if (entityType != null)
                 {
diff --git a/src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs b/src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs
@@ -134,7 +134,7 @@ private async Task<bool> ValidateIfMatchHeaderAsync(HttpContext httpContext, Jso
         private static async Task<bool> ValidateContentTypeHeaderAsync(string allowedContentType, HttpContext httpContext,
             JsonSerializerOptions serializerOptions)
         {
-            string contentType = httpContext.Request.ContentType;
+            string? contentType = httpContext.Request.ContentType;
 
             // ReSharper disable once ConditionIsAlwaysTrueOrFalse
             // Justification: Workaround for https://github.com/dotnet/aspnetcore/issues/32097 (fixed in .NET 6)
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs
@@ -109,7 +109,7 @@ private ICollection<PropertySelector> ToPropertySelectors(IDictionary<ResourceFi
 
                 foreach (IProperty entityProperty in entityProperties)
                 {
-                    var propertySelector = new PropertySelector(entityProperty.PropertyInfo);
+                    var propertySelector = new PropertySelector(entityProperty.PropertyInfo!);
 
                     if (propertySelector.Property.SetMethod != null)
                     {
diff --git a/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs b/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs
@@ -379,7 +379,7 @@ private bool RequiresLoadOfRelationshipForDeletion(RelationshipAttribute relatio
 
         private INavigation? GetNavigation(RelationshipAttribute relationship)
         {
-            IEntityType entityType = _dbContext.Model.FindEntityType(typeof(TResource));
+            IEntityType? entityType = _dbContext.Model.FindEntityType(typeof(TResource));
             return entityType?.FindNavigation(relationship.Property.Name);
         }
 
diff --git a/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs b/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs
@@ -257,7 +257,7 @@ private bool ShouldIncludeResourceLink(LinkTypes linkType, ResourceType resource
             return _options.ResourceLinks.HasFlag(linkType);
         }
 
-        private string GetLinkForResourceSelf(ResourceType resourceType, string resourceId)
+        private string? GetLinkForResourceSelf(ResourceType resourceType, string resourceId)
         {
             string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(resourceType);
             IDictionary<string, object?> routeValues = GetRouteValues(resourceId, null);
@@ -286,15 +286,15 @@ private string GetLinkForResourceSelf(ResourceType resourceType, string resource
             return links.HasValue() ? links : null;
         }
 
-        private string GetLinkForRelationshipSelf(string leftId, RelationshipAttribute relationship)
+        private string? GetLinkForRelationshipSelf(string leftId, RelationshipAttribute relationship)
         {
             string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(relationship.LeftType);
             IDictionary<string, object?> routeValues = GetRouteValues(leftId, relationship.PublicName);
 
             return RenderLinkForAction(controllerName, GetRelationshipControllerActionName, routeValues);
         }
 
-        private string GetLinkForRelationshipRelated(string leftId, RelationshipAttribute relationship)
+        private string? GetLinkForRelationshipRelated(string leftId, RelationshipAttribute relationship)
         {
             string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(relationship.LeftType);
             IDictionary<string, object?> routeValues = GetRouteValues(leftId, relationship.PublicName);
@@ -315,11 +315,11 @@ private string GetLinkForRelationshipRelated(string leftId, RelationshipAttribut
             return routeValues;
         }
 
-        protected virtual string RenderLinkForAction(string? controllerName, string actionName, IDictionary<string, object?> routeValues)
+        protected virtual string? RenderLinkForAction(string? controllerName, string actionName, IDictionary<string, object?> routeValues)
         {
             return _options.UseRelativeLinks
-                ? _linkGenerator.GetPathByAction(_httpContextAccessor.HttpContext, actionName, controllerName, routeValues)
-                : _linkGenerator.GetUriByAction(_httpContextAccessor.HttpContext, actionName, controllerName, routeValues);
+                ? _linkGenerator.GetPathByAction(HttpContext, actionName, controllerName, routeValues)
+                : _linkGenerator.GetUriByAction(HttpContext, actionName, controllerName, routeValues);
         }
 
         /// <summary>
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs
@@ -13,7 +13,7 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
-using Microsoft.EntityFrameworkCore;
+using TestBuildingBlocks;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
 {
@@ -134,8 +134,7 @@ public override async Task OnWritingAsync(TelevisionBroadcast broadcast, WriteOp
             }
             else if (writeOperation == WriteOperationKind.DeleteResource)
             {
-                TelevisionBroadcast broadcastToDelete =
-                    await _dbContext.Broadcasts.FirstOrDefaultAsync(resource => resource.Id == broadcast.Id, cancellationToken);
+                TelevisionBroadcast? broadcastToDelete = await _dbContext.Broadcasts.FirstWithIdAsync(broadcast.Id, cancellationToken);
 
                 if (broadcastToDelete != null)
                 {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
@@ -13,7 +13,7 @@ public sealed class LyricRepository : EntityFrameworkCoreRepository<Lyric, long>
     {
         private readonly ExtraDbContext _extraDbContext;
 
-        public override string TransactionId => _extraDbContext.Database.CurrentTransaction.TransactionId.ToString();
+        public override string? TransactionId => _extraDbContext.Database.CurrentTransaction?.TransactionId.ToString();
 
         public LyricRepository(ExtraDbContext extraDbContext, ITargetedFields targetedFields, IDbContextResolver dbContextResolver,
             IResourceGraph resourceGraph, IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders,
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs
@@ -186,7 +186,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
             await _testContext.RunOnDatabaseAsync(async dbContext =>
             {
-                Car carInDatabase = await dbContext.Cars.FirstOrDefaultAsync(car => car.RegionId == newCar.RegionId && car.LicensePlate == newCar.LicensePlate);
+                Car? carInDatabase =
+                    await dbContext.Cars.FirstOrDefaultAsync(car => car.RegionId == newCar.RegionId && car.LicensePlate == newCar.LicensePlate);
 
                 carInDatabase.ShouldNotBeNull();
                 carInDatabase.Id.Should().Be($"{newCar.RegionId}:{newCar.LicensePlate}");
@@ -508,7 +509,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
             await _testContext.RunOnDatabaseAsync(async dbContext =>
             {
-                Car carInDatabase =
+                Car? carInDatabase =
                     await dbContext.Cars.FirstOrDefaultAsync(car => car.RegionId == existingCar.RegionId && car.LicensePlate == existingCar.LicensePlate);
 
                 carInDatabase.Should().BeNull();
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Links/LinkInclusionTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Links/LinkInclusionTests.cs
@@ -412,7 +412,7 @@ public override string GetUriByAddress<TAddress>(HttpContext httpContext, TAddre
                 return "https://domain.com/some/path";
             }
 
-            public override string GetUriByAddress<TAddress>(TAddress address, RouteValueDictionary values, string scheme, HostString host,
+            public override string GetUriByAddress<TAddress>(TAddress address, RouteValueDictionary values, string? scheme, HostString host,
                 PathString pathBase = new(), FragmentString fragment = new(), LinkOptions? options = null)
             {
                 throw new NotImplementedException();
diff --git a/test/TestBuildingBlocks/DbContextExtensions.cs b/test/TestBuildingBlocks/DbContextExtensions.cs
@@ -38,14 +38,14 @@ private static async Task ClearTablesAsync(this DbContext dbContext, params Type
         {
             foreach (Type model in models)
             {
-                IEntityType entityType = dbContext.Model.FindEntityType(model);
+                IEntityType? entityType = dbContext.Model.FindEntityType(model);
 
                 if (entityType == null)
                 {
                     throw new InvalidOperationException($"Table for '{model.Name}' not found.");
                 }
 
-                string tableName = entityType.GetTableName();
+                string tableName = entityType.GetTableName()!;
 
                 // PERF: We first try to clear the table, which is fast and usually succeeds, unless foreign key constraints are violated.
                 // In that case, we recursively delete all related data, which is slow.
diff --git a/test/TestBuildingBlocks/FakeLoggerFactory.cs b/test/TestBuildingBlocks/FakeLoggerFactory.cs
@@ -51,7 +51,7 @@ public void Clear()
                 _messages.Clear();
             }
 
-            public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+            public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
             {
                 if (IsEnabled(logLevel))
                 {

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ private void Resolve(DbContext dbContext)`
`38`	`38`	`{`
`39`	`39`	`foreach (ResourceType resourceType in _resourceGraph.GetResourceTypes().Where(resourceType => resourceType.Relationships.Any()))`
`40`	`40`	`{`
`41`		`- IEntityType entityType = dbContext.Model.FindEntityType(resourceType.ClrType);`
	`41`	`+ IEntityType? entityType = dbContext.Model.FindEntityType(resourceType.ClrType);`
`42`	`42`
`43`	`43`	`if (entityType != null)`
`44`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ private async Task<bool> ValidateIfMatchHeaderAsync(HttpContext httpContext, Jso`
`134`	`134`	`private static async Task<bool> ValidateContentTypeHeaderAsync(string allowedContentType, HttpContext httpContext,`
`135`	`135`	`JsonSerializerOptions serializerOptions)`
`136`	`136`	`{`
`137`		`- string contentType = httpContext.Request.ContentType;`
	`137`	`+ string? contentType = httpContext.Request.ContentType;`
`138`	`138`
`139`	`139`	`// ReSharper disable once ConditionIsAlwaysTrueOrFalse`
`140`	`140`	`// Justification: Workaround for https://github.com/dotnet/aspnetcore/issues/32097 (fixed in .NET 6)`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private ICollection<PropertySelector> ToPropertySelectors(IDictionary<ResourceFi`
`109`	`109`
`110`	`110`	`foreach (IProperty entityProperty in entityProperties)`
`111`	`111`	`{`
`112`		`- var propertySelector = new PropertySelector(entityProperty.PropertyInfo);`
	`112`	`+ var propertySelector = new PropertySelector(entityProperty.PropertyInfo!);`
`113`	`113`
`114`	`114`	`if (propertySelector.Property.SetMethod != null)`
`115`	`115`	`{`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ private bool RequiresLoadOfRelationshipForDeletion(RelationshipAttribute relatio`
`379`	`379`
`380`	`380`	`private INavigation? GetNavigation(RelationshipAttribute relationship)`
`381`	`381`	`{`
`382`		`- IEntityType entityType = _dbContext.Model.FindEntityType(typeof(TResource));`
	`382`	`+ IEntityType? entityType = _dbContext.Model.FindEntityType(typeof(TResource));`
`383`	`383`	`return entityType?.FindNavigation(relationship.Property.Name);`
`384`	`384`	`}`
`385`	`385`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ private bool ShouldIncludeResourceLink(LinkTypes linkType, ResourceType resource`
`257`	`257`	`return _options.ResourceLinks.HasFlag(linkType);`
`258`	`258`	`}`
`259`	`259`
`260`		`- private string GetLinkForResourceSelf(ResourceType resourceType, string resourceId)`
	`260`	`+ private string? GetLinkForResourceSelf(ResourceType resourceType, string resourceId)`
`261`	`261`	`{`
`262`	`262`	`string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(resourceType);`
`263`	`263`	`IDictionary<string, object?> routeValues = GetRouteValues(resourceId, null);`
`@@ -286,15 +286,15 @@ private string GetLinkForResourceSelf(ResourceType resourceType, string resource`
`286`	`286`	`return links.HasValue() ? links : null;`
`287`	`287`	`}`
`288`	`288`
`289`		`- private string GetLinkForRelationshipSelf(string leftId, RelationshipAttribute relationship)`
	`289`	`+ private string? GetLinkForRelationshipSelf(string leftId, RelationshipAttribute relationship)`
`290`	`290`	`{`
`291`	`291`	`string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(relationship.LeftType);`
`292`	`292`	`IDictionary<string, object?> routeValues = GetRouteValues(leftId, relationship.PublicName);`
`293`	`293`
`294`	`294`	`return RenderLinkForAction(controllerName, GetRelationshipControllerActionName, routeValues);`
`295`	`295`	`}`
`296`	`296`
`297`		`- private string GetLinkForRelationshipRelated(string leftId, RelationshipAttribute relationship)`
	`297`	`+ private string? GetLinkForRelationshipRelated(string leftId, RelationshipAttribute relationship)`
`298`	`298`	`{`
`299`	`299`	`string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(relationship.LeftType);`
`300`	`300`	`IDictionary<string, object?> routeValues = GetRouteValues(leftId, relationship.PublicName);`
`@@ -315,11 +315,11 @@ private string GetLinkForRelationshipRelated(string leftId, RelationshipAttribut`
`315`	`315`	`return routeValues;`
`316`	`316`	`}`
`317`	`317`
`318`		`- protected virtual string RenderLinkForAction(string? controllerName, string actionName, IDictionary<string, object?> routeValues)`
	`318`	`+ protected virtual string? RenderLinkForAction(string? controllerName, string actionName, IDictionary<string, object?> routeValues)`
`319`	`319`	`{`
`320`	`320`	`return _options.UseRelativeLinks`
`321`		`- ? _linkGenerator.GetPathByAction(_httpContextAccessor.HttpContext, actionName, controllerName, routeValues)`
`322`		`- : _linkGenerator.GetUriByAction(_httpContextAccessor.HttpContext, actionName, controllerName, routeValues);`
	`321`	`+ ? _linkGenerator.GetPathByAction(HttpContext, actionName, controllerName, routeValues)`
	`322`	`+ : _linkGenerator.GetUriByAction(HttpContext, actionName, controllerName, routeValues);`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`using JsonApiDotNetCore.Resources;`
`14`	`14`	`using JsonApiDotNetCore.Resources.Annotations;`
`15`	`15`	`using JsonApiDotNetCore.Serialization.Objects;`
`16`		`-using Microsoft.EntityFrameworkCore;`
	`16`	`+using TestBuildingBlocks;`
`17`	`17`
`18`	`18`	`namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving`
`19`	`19`	`{`
`@@ -134,8 +134,7 @@ public override async Task OnWritingAsync(TelevisionBroadcast broadcast, WriteOp`
`134`	`134`	`}`
`135`	`135`	`else if (writeOperation == WriteOperationKind.DeleteResource)`
`136`	`136`	`{`
`137`		`- TelevisionBroadcast broadcastToDelete =`
`138`		`- await _dbContext.Broadcasts.FirstOrDefaultAsync(resource => resource.Id == broadcast.Id, cancellationToken);`
	`137`	`+ TelevisionBroadcast? broadcastToDelete = await _dbContext.Broadcasts.FirstWithIdAsync(broadcast.Id, cancellationToken);`
`139`	`138`
`140`	`139`	`if (broadcastToDelete != null)`
`141`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public sealed class LyricRepository : EntityFrameworkCoreRepository<Lyric, long>`
`13`	`13`	`{`
`14`	`14`	`private readonly ExtraDbContext _extraDbContext;`
`15`	`15`
`16`		`- public override string TransactionId => _extraDbContext.Database.CurrentTransaction.TransactionId.ToString();`
	`16`	`+ public override string? TransactionId => _extraDbContext.Database.CurrentTransaction?.TransactionId.ToString();`
`17`	`17`
`18`	`18`	`public LyricRepository(ExtraDbContext extraDbContext, ITargetedFields targetedFields, IDbContextResolver dbContextResolver,`
`19`	`19`	`IResourceGraph resourceGraph, IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders,`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`186`	`186`
`187`	`187`	`await _testContext.RunOnDatabaseAsync(async dbContext =>`
`188`	`188`	`{`
`189`		`- Car carInDatabase = await dbContext.Cars.FirstOrDefaultAsync(car => car.RegionId == newCar.RegionId && car.LicensePlate == newCar.LicensePlate);`
	`189`	`+ Car? carInDatabase =`
	`190`	`+ await dbContext.Cars.FirstOrDefaultAsync(car => car.RegionId == newCar.RegionId && car.LicensePlate == newCar.LicensePlate);`
`190`	`191`
`191`	`192`	`carInDatabase.ShouldNotBeNull();`
`192`	`193`	`carInDatabase.Id.Should().Be($"{newCar.RegionId}:{newCar.LicensePlate}");`
`@@ -508,7 +509,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`508`	`509`
`509`	`510`	`await _testContext.RunOnDatabaseAsync(async dbContext =>`
`510`	`511`	`{`
`511`		`- Car carInDatabase =`
	`512`	`+ Car? carInDatabase =`
`512`	`513`	`await dbContext.Cars.FirstOrDefaultAsync(car => car.RegionId == existingCar.RegionId && car.LicensePlate == existingCar.LicensePlate);`
`513`	`514`
`514`	`515`	`carInDatabase.Should().BeNull();`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ public override string GetUriByAddress<TAddress>(HttpContext httpContext, TAddre`
`412`	`412`	`return "https://domain.com/some/path";`
`413`	`413`	`}`
`414`	`414`
`415`		`- public override string GetUriByAddress<TAddress>(TAddress address, RouteValueDictionary values, string scheme, HostString host,`
	`415`	`+ public override string GetUriByAddress<TAddress>(TAddress address, RouteValueDictionary values, string? scheme, HostString host,`
`416`	`416`	`PathString pathBase = new(), FragmentString fragment = new(), LinkOptions? options = null)`
`417`	`417`	`{`
`418`	`418`	`throw new NotImplementedException();`
Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,14 @@ private static async Task ClearTablesAsync(this DbContext dbContext, params Type`
`38`	`38`	`{`
`39`	`39`	`foreach (Type model in models)`
`40`	`40`	`{`
`41`		`- IEntityType entityType = dbContext.Model.FindEntityType(model);`
	`41`	`+ IEntityType? entityType = dbContext.Model.FindEntityType(model);`
`42`	`42`
`43`	`43`	`if (entityType == null)`
`44`	`44`	`{`
`45`	`45`	`throw new InvalidOperationException($"Table for '{model.Name}' not found.");`
`46`	`46`	`}`
`47`	`47`
`48`		`- string tableName = entityType.GetTableName();`
	`48`	`+ string tableName = entityType.GetTableName()!;`
`49`	`49`
`50`	`50`	`// PERF: We first try to clear the table, which is fast and usually succeeds, unless foreign key constraints are violated.`
`51`	`51`	`// In that case, we recursively delete all related data, which is slow.`