Update for changed nullability annotations in .NET 7

bkoelman · bkoelman · commit 9039dcd58202 · 2022-11-12T12:17:51.000+01:00
diff --git a/src/Examples/DatabasePerTenantExample/Data/AppDbContext.cs b/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)
         {
diff --git a/src/Examples/NoEntityFrameworkExample/Services/WorkItemService.cs b/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)
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/FilterQueryStringParameterReader.cs b/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;
         }
     }
 
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/IncludeQueryStringParameterReader.cs b/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)
         {
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/PaginationQueryStringParameterReader.cs b/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))
             {
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/SortQueryStringParameterReader.cs b/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);
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/SparseFieldSetQueryStringParameterReader.cs b/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;
         }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs b/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);
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs b/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));
         }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs b/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);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`36`	`36`	`private string GetConnectionString()`
`37`	`37`	`{`
`38`	`38`	`string? tenantName = GetTenantName();`
`39`		`- string connectionString = _configuration[$"Data:{tenantName ?? "Default"}Connection"];`
	`39`	`+ string? connectionString = _configuration[$"Data:{tenantName ?? "Default"}Connection"];`
`40`	`40`
`41`	`41`	`if (connectionString == null)`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@ namespace NoEntityFrameworkExample.Services;`
`11`	`11`	`[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]`
`12`	`12`	`public sealed class WorkItemService : IResourceService<WorkItem, int>`
`13`	`13`	`{`
`14`		`- private readonly string _connectionString;`
	`14`	`+ private readonly string? _connectionString;`
`15`	`15`
`16`	`16`	`public WorkItemService(IConfiguration configuration)`
`17`	`17`	`{`
`18`	`18`	`string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";`
`19`		`- _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);`
	`19`	`+ _connectionString = configuration["Data:DefaultConnection"]?.Replace("###", postgresPassword);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public async Task<IReadOnlyCollection<WorkItem>> GetAsync(CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -77,18 +77,21 @@ public virtual void Read(string parameterName, StringValues parameterValue)`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`- private IEnumerable<string> ExtractParameterValue(string parameterValue)`
	`80`	`+ private IEnumerable<string> ExtractParameterValue(string? parameterValue)`
`81`	`81`	`{`
`82`		`- if (_options.EnableLegacyFilterNotation)`
	`82`	`+ if (parameterValue != null)`
`83`	`83`	`{`
`84`		`- foreach (string condition in LegacyConverter.ExtractConditions(parameterValue))`
	`84`	`+ if (_options.EnableLegacyFilterNotation)`
`85`	`85`	`{`
`86`		`- yield return condition;`
	`86`	`+ foreach (string condition in LegacyConverter.ExtractConditions(parameterValue))`
	`87`	`+ {`
	`88`	`+ yield return condition;`
	`89`	`+ }`
	`90`	`+ }`
	`91`	`+ else`
	`92`	`+ {`
	`93`	`+ yield return parameterValue;`
`87`	`94`	`}`
`88`		`- }`
`89`		`- else`
`90`		`- {`
`91`		`- yield return parameterValue;`
`92`	`95`	`}`
`93`	`96`	`}`
`94`	`97`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)`
`48`	`48`	`{`
`49`	`49`	`try`
`50`	`50`	`{`
`51`		`- _includeExpression = GetInclude(parameterValue);`
	`51`	`+ _includeExpression = GetInclude(parameterValue.ToString());`
`52`	`52`	`}`
`53`	`53`	`catch (QueryParseException exception)`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)`
`53`	`53`	`{`
`54`	`54`	`try`
`55`	`55`	`{`
`56`		`- PaginationQueryStringValueExpression constraint = GetPageConstraint(parameterValue);`
	`56`	`+ PaginationQueryStringValueExpression constraint = GetPageConstraint(parameterValue.ToString());`
`57`	`57`
`58`	`58`	`if (constraint.Elements.Any(element => element.Scope == null))`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)`
`62`	`62`	`try`
`63`	`63`	`{`
`64`	`64`	`ResourceFieldChainExpression? scope = GetScope(parameterName);`
`65`		`- SortExpression sort = GetSort(parameterValue, scope);`
	`65`	`+ SortExpression sort = GetSort(parameterValue.ToString(), scope);`
`66`	`66`
`67`	`67`	`var expressionInScope = new ExpressionInScope(scope, sort);`
`68`	`68`	`_constraints.Add(expressionInScope);`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)`
`69`	`69`	`try`
`70`	`70`	`{`
`71`	`71`	`ResourceType targetResourceType = GetSparseFieldType(parameterName);`
`72`		`- SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue, targetResourceType);`
	`72`	`+ SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue.ToString(), targetResourceType);`
`73`	`73`
`74`	`74`	`_sparseFieldTableBuilder[targetResourceType] = sparseFieldSet;`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,13 +140,13 @@ private void SetPaginationInTopLevelLinks(ResourceType resourceType, TopLevelLin`
`140`	`140`
`141`	`141`	`private string? CalculatePageSizeValue(PageSize? topPageSize, ResourceType resourceType)`
`142`	`142`	`{`
`143`		`- string pageSizeParameterValue = HttpContext.Request.Query[PageSizeParameterName];`
	`143`	`+ string? pageSizeParameterValue = HttpContext.Request.Query[PageSizeParameterName];`
`144`	`144`
`145`	`145`	`PageSize? newTopPageSize = Equals(topPageSize, _options.DefaultPageSize) ? null : topPageSize;`
`146`	`146`	`return ChangeTopPageSize(pageSizeParameterValue, newTopPageSize, resourceType);`
`147`	`147`	`}`
`148`	`148`
`149`		`- private string? ChangeTopPageSize(string pageSizeParameterValue, PageSize? topPageSize, ResourceType resourceType)`
	`149`	`+ private string? ChangeTopPageSize(string? pageSizeParameterValue, PageSize? topPageSize, ResourceType resourceType)`
`150`	`150`	`{`
`151`	`151`	`IImmutableList<PaginationElementQueryStringValueExpression> elements = ParsePageSizeExpression(pageSizeParameterValue, resourceType);`
`152`	`152`	`int elementInTopScopeIndex = elements.FindIndex(expression => expression.Scope == null);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ private IQueryable<MusicTrack> FilterOnRecentlyReleased(IQueryable<MusicTrack> s`
`32`	`32`	`{`
`33`	`33`	`IQueryable<MusicTrack> tracks = source;`
`34`	`34`
`35`		`- if (bool.Parse(parameterValue))`
	`35`	`+ if (bool.Parse(parameterValue.ToString()))`
`36`	`36`	`{`
`37`	`37`	`tracks = tracks.Where(musicTrack => musicTrack.ReleasedAt < _systemClock.UtcNow && musicTrack.ReleasedAt > _systemClock.UtcNow.AddMonths(-3));`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public override QueryStringParameterHandlers<Moon> OnRegisterQueryableHandlersFo`
`51`	`51`
`52`	`52`	`private static IQueryable<Moon> FilterByRadius(IQueryable<Moon> source, StringValues parameterValue)`
`53`	`53`	`{`
`54`		`- bool isFilterOnLargerThan = bool.Parse(parameterValue);`
	`54`	`+ bool isFilterOnLargerThan = bool.Parse(parameterValue.ToString());`
`55`	`55`	`return isFilterOnLargerThan ? source.Where(moon => moon.SolarRadius > 1m) : source.Where(moon => moon.SolarRadius <= 1m);`
`56`	`56`	`}`
`57`	`57`	`}`