Update for changed nullability annotations in .NET 7

Author: bkoelman

src/Examples/DatabasePerTenantExample/Data/AppDbContext.cs

@@ -36,7 +36,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     private string GetConnectionString()
     {
         string? tenantName = GetTenantName();
-        string connectionString = _configuration[$"Data:{tenantName ?? "Default"}Connection"];
+        string? connectionString = _configuration[$"Data:{tenantName ?? "Default"}Connection"];
 
         if (connectionString == null)
         {

src/Examples/NoEntityFrameworkExample/Services/WorkItemService.cs

@@ -11,12 +11,12 @@ namespace NoEntityFrameworkExample.Services;
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 public sealed class WorkItemService : IResourceService<WorkItem, int>
 {
-    private readonly string _connectionString;
+    private readonly string? _connectionString;
 
     public WorkItemService(IConfiguration configuration)
     {
         string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
-        _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
+        _connectionString = configuration["Data:DefaultConnection"]?.Replace("###", postgresPassword);
     }
 
     public async Task<IReadOnlyCollection<WorkItem>> GetAsync(CancellationToken cancellationToken)

src/JsonApiDotNetCore/QueryStrings/Internal/FilterQueryStringParameterReader.cs

@@ -77,18 +77,21 @@ public virtual void Read(string parameterName, StringValues parameterValue)
         }
     }
 
-    private IEnumerable<string> ExtractParameterValue(string parameterValue)
+    private IEnumerable<string> ExtractParameterValue(string? parameterValue)
     {
-        if (_options.EnableLegacyFilterNotation)
+        if (parameterValue != null)
         {
-            foreach (string condition in LegacyConverter.ExtractConditions(parameterValue))
+            if (_options.EnableLegacyFilterNotation)
             {
-                yield return condition;
+                foreach (string condition in LegacyConverter.ExtractConditions(parameterValue))
+                {
+                    yield return condition;
+                }
+            }
+            else
+            {
+                yield return parameterValue;
             }
-        }
-        else
-        {
-            yield return parameterValue;
         }
     }
 

src/JsonApiDotNetCore/QueryStrings/Internal/IncludeQueryStringParameterReader.cs

@@ -48,7 +48,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)
     {
         try
         {
-            _includeExpression = GetInclude(parameterValue);
+            _includeExpression = GetInclude(parameterValue.ToString());
         }
         catch (QueryParseException exception)
         {

src/JsonApiDotNetCore/QueryStrings/Internal/PaginationQueryStringParameterReader.cs

@@ -53,7 +53,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)
     {
         try
         {
-            PaginationQueryStringValueExpression constraint = GetPageConstraint(parameterValue);
+            PaginationQueryStringValueExpression constraint = GetPageConstraint(parameterValue.ToString());
 
             if (constraint.Elements.Any(element => element.Scope == null))
             {

src/JsonApiDotNetCore/QueryStrings/Internal/SortQueryStringParameterReader.cs

@@ -62,7 +62,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)
         try
         {
             ResourceFieldChainExpression? scope = GetScope(parameterName);
-            SortExpression sort = GetSort(parameterValue, scope);
+            SortExpression sort = GetSort(parameterValue.ToString(), scope);
 
             var expressionInScope = new ExpressionInScope(scope, sort);
             _constraints.Add(expressionInScope);

src/JsonApiDotNetCore/QueryStrings/Internal/SparseFieldSetQueryStringParameterReader.cs

@@ -69,7 +69,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)
         try
         {
             ResourceType targetResourceType = GetSparseFieldType(parameterName);
-            SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue, targetResourceType);
+            SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue.ToString(), targetResourceType);
 
             _sparseFieldTableBuilder[targetResourceType] = sparseFieldSet;
         }

src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs

@@ -140,13 +140,13 @@ private void SetPaginationInTopLevelLinks(ResourceType resourceType, TopLevelLin
 
     private string? CalculatePageSizeValue(PageSize? topPageSize, ResourceType resourceType)
     {
-        string pageSizeParameterValue = HttpContext.Request.Query[PageSizeParameterName];
+        string? pageSizeParameterValue = HttpContext.Request.Query[PageSizeParameterName];
 
         PageSize? newTopPageSize = Equals(topPageSize, _options.DefaultPageSize) ? null : topPageSize;
         return ChangeTopPageSize(pageSizeParameterValue, newTopPageSize, resourceType);
     }
 
-    private string? ChangeTopPageSize(string pageSizeParameterValue, PageSize? topPageSize, ResourceType resourceType)
+    private string? ChangeTopPageSize(string? pageSizeParameterValue, PageSize? topPageSize, ResourceType resourceType)
     {
         IImmutableList<PaginationElementQueryStringValueExpression> elements = ParsePageSizeExpression(pageSizeParameterValue, resourceType);
         int elementInTopScopeIndex = elements.FindIndex(expression => expression.Scope == null);

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs

@@ -32,7 +32,7 @@ private IQueryable<MusicTrack> FilterOnRecentlyReleased(IQueryable<MusicTrack> s
     {
         IQueryable<MusicTrack> tracks = source;
 
-        if (bool.Parse(parameterValue))
+        if (bool.Parse(parameterValue.ToString()))
         {
             tracks = tracks.Where(musicTrack => musicTrack.ReleasedAt < _systemClock.UtcNow && musicTrack.ReleasedAt > _systemClock.UtcNow.AddMonths(-3));
         }

test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs

@@ -51,7 +51,7 @@ public override QueryStringParameterHandlers<Moon> OnRegisterQueryableHandlersFo
 
     private static IQueryable<Moon> FilterByRadius(IQueryable<Moon> source, StringValues parameterValue)
     {
-        bool isFilterOnLargerThan = bool.Parse(parameterValue);
+        bool isFilterOnLargerThan = bool.Parse(parameterValue.ToString());
         return isFilterOnLargerThan ? source.Where(moon => moon.SolarRadius > 1m) : source.Where(moon => moon.SolarRadius <= 1m);
     }
 }