Adapt to changes in nullability annotations

Author: Bart Koelman

src/JsonApiDotNetCore/Controllers/BaseJsonApiOperationsController.cs

@@ -133,7 +133,7 @@ protected virtual void ValidateModelState(IList<OperationContainer> operations)
             using IDisposable _ = new RevertRequestStateOnDispose(_request, _targetedFields);
 
             int operationIndex = 0;
-            var requestModelState = new List<(string key, ModelStateEntry entry)>();
+            var requestModelState = new List<(string key, ModelStateEntry? entry)>();
             int maxErrorsRemaining = ModelState.MaxAllowedErrors;
 
             foreach (OperationContainer operation in operations)
@@ -150,15 +150,15 @@ protected virtual void ValidateModelState(IList<OperationContainer> operations)
 
             if (requestModelState.Any())
             {
-                Dictionary<string, ModelStateEntry> modelStateDictionary = requestModelState.ToDictionary(tuple => tuple.key, tuple => tuple.entry);
+                Dictionary<string, ModelStateEntry?> modelStateDictionary = requestModelState.ToDictionary(tuple => tuple.key, tuple => tuple.entry);
 
                 throw new InvalidModelStateException(modelStateDictionary, typeof(IList<OperationContainer>), _options.IncludeExceptionStackTraceInErrors,
                     _resourceGraph,
                     (collectionType, index) => collectionType == typeof(IList<OperationContainer>) ? operations[index].Resource.GetType() : null);
             }
         }
 
-        private int ValidateOperation(OperationContainer operation, int operationIndex, List<(string key, ModelStateEntry entry)> requestModelState,
+        private int ValidateOperation(OperationContainer operation, int operationIndex, List<(string key, ModelStateEntry? entry)> requestModelState,
             int maxErrorsRemaining)
         {
             if (operation.Request.WriteOperation is WriteOperationKind.CreateResource or WriteOperationKind.UpdateResource)
@@ -182,7 +182,7 @@ private int ValidateOperation(OperationContainer operation, int operationIndex,
 
                     foreach (string key in validationContext.ModelState.Keys)
                     {
-                        ModelStateEntry entry = validationContext.ModelState[key];
+                        ModelStateEntry entry = validationContext.ModelState[key]!;
 
                         if (entry.ValidationState == ModelValidationState.Invalid)
                         {

src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs

@@ -20,13 +20,13 @@ namespace JsonApiDotNetCore.Errors
     [PublicAPI]
     public sealed class InvalidModelStateException : JsonApiException
     {
-        public InvalidModelStateException(IReadOnlyDictionary<string, ModelStateEntry> modelState, Type modelType, bool includeExceptionStackTraceInErrors,
+        public InvalidModelStateException(IReadOnlyDictionary<string, ModelStateEntry?> modelState, Type modelType, bool includeExceptionStackTraceInErrors,
             IResourceGraph resourceGraph, Func<Type, int, Type?>? getCollectionElementTypeCallback = null)
             : base(FromModelStateDictionary(modelState, modelType, resourceGraph, includeExceptionStackTraceInErrors, getCollectionElementTypeCallback))
         {
         }
 
-        private static IEnumerable<ErrorObject> FromModelStateDictionary(IReadOnlyDictionary<string, ModelStateEntry> modelState, Type modelType,
+        private static IEnumerable<ErrorObject> FromModelStateDictionary(IReadOnlyDictionary<string, ModelStateEntry?> modelState, Type modelType,
             IResourceGraph resourceGraph, bool includeExceptionStackTraceInErrors, Func<Type, int, Type?>? getCollectionElementTypeCallback)
         {
             ArgumentGuard.NotNull(modelState, nameof(modelState));
@@ -45,15 +45,15 @@ private static IEnumerable<ErrorObject> FromModelStateDictionary(IReadOnlyDictio
         }
 
         private static IEnumerable<(ModelStateEntry entry, string? sourcePointer)> ResolveSourcePointers(
-            IReadOnlyDictionary<string, ModelStateEntry> modelState, Type modelType, IResourceGraph resourceGraph,
+            IReadOnlyDictionary<string, ModelStateEntry?> modelState, Type modelType, IResourceGraph resourceGraph,
             Func<Type, int, Type?>? getCollectionElementTypeCallback)
         {
             foreach (string key in modelState.Keys)
             {
                 var rootSegment = ModelStateKeySegment.Create(modelType, key, getCollectionElementTypeCallback);
                 string? sourcePointer = ResolveSourcePointer(rootSegment, resourceGraph);
 
-                yield return (modelState[key], sourcePointer);
+                yield return (modelState[key]!, sourcePointer);
             }
         }
 

src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs

@@ -112,7 +112,7 @@ private void IncludeAllProperties(Type elementType, Dictionary<PropertyInfo, Pro
 
             foreach (IProperty entityProperty in entityProperties)
             {
-                var propertySelector = new PropertySelector(entityProperty.PropertyInfo);
+                var propertySelector = new PropertySelector(entityProperty.PropertyInfo!);
                 IncludeWritableProperty(propertySelector, propertySelectors);
             }
         }