Revert workaround for Resharper bug on nullability

bkoelman · bkoelman · commit e57971b0a695 · 2023-11-24T12:14:06.000+01:00
diff --git a/src/JsonApiDotNetCore/QueryStrings/IncludeQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/IncludeQueryStringParameterReader.cs
@@ -47,14 +47,10 @@ public virtual void Read(string parameterName, StringValues parameterValue)
     {
         try
         {
-            // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
-            // ReSharper disable once AssignNullToNotNullAttribute
             _includeExpression = GetInclude(parameterValue.ToString());
         }
         catch (QueryParseException exception)
         {
-            // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
-            // ReSharper disable once AssignNullToNotNullAttribute
             string specificMessage = exception.GetMessageWithPosition(parameterValue.ToString());
             throw new InvalidQueryStringParameterException(parameterName, "The specified include is invalid.", specificMessage, exception);
         }
diff --git a/src/JsonApiDotNetCore/QueryStrings/PaginationQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/PaginationQueryStringParameterReader.cs
@@ -58,8 +58,6 @@ public virtual void Read(string parameterName, StringValues parameterValue)
 
         try
         {
-            // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
-            // ReSharper disable once AssignNullToNotNullAttribute
             PaginationQueryStringValueExpression constraint = GetPageConstraint(parameterValue.ToString());
 
             if (constraint.Elements.Any(element => element.Scope == null))
@@ -82,8 +80,6 @@ public virtual void Read(string parameterName, StringValues parameterValue)
         }
         catch (QueryParseException exception)
         {
-            // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
-            // ReSharper disable once AssignNullToNotNullAttribute
             string specificMessage = exception.GetMessageWithPosition(isParameterNameValid ? parameterValue.ToString() : parameterName);
             throw new InvalidQueryStringParameterException(parameterName, "The specified pagination is invalid.", specificMessage, exception);
         }
diff --git a/src/JsonApiDotNetCore/QueryStrings/SortQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/SortQueryStringParameterReader.cs
@@ -59,16 +59,12 @@ public virtual void Read(string parameterName, StringValues parameterValue)
             ResourceFieldChainExpression? scope = GetScope(parameterName);
             parameterNameIsValid = true;
 
-            // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
-            // ReSharper disable once AssignNullToNotNullAttribute
             SortExpression sort = GetSort(parameterValue.ToString(), scope);
             var expressionInScope = new ExpressionInScope(scope, sort);
             _constraints.Add(expressionInScope);
         }
         catch (QueryParseException exception)
         {
-            // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
-            // ReSharper disable once AssignNullToNotNullAttribute
             string specificMessage = exception.GetMessageWithPosition(parameterNameIsValid ? parameterValue.ToString() : parameterName);
             throw new InvalidQueryStringParameterException(parameterName, "The specified sort is invalid.", specificMessage, exception);
         }
diff --git a/src/JsonApiDotNetCore/QueryStrings/SparseFieldSetQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/SparseFieldSetQueryStringParameterReader.cs
@@ -63,15 +63,11 @@ public virtual void Read(string parameterName, StringValues parameterValue)
             ResourceType resourceType = GetScope(parameterName);
             parameterNameIsValid = true;
 
-            // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
-            // ReSharper disable once AssignNullToNotNullAttribute
             SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue.ToString(), resourceType);
             _sparseFieldTableBuilder[resourceType] = sparseFieldSet;
         }
         catch (QueryParseException exception)
         {
-            // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
-            // ReSharper disable once AssignNullToNotNullAttribute
             string specificMessage = exception.GetMessageWithPosition(parameterNameIsValid ? parameterValue.ToString() : parameterName);
             throw new InvalidQueryStringParameterException(parameterName, "The specified fieldset is invalid.", specificMessage, exception);
         }

Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,10 @@ public virtual void Read(string parameterName, StringValues parameterValue)`
`47`	`47`	`{`
`48`	`48`	`try`
`49`	`49`	`{`
`50`		`- // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment`
`51`		`- // ReSharper disable once AssignNullToNotNullAttribute`
`52`	`50`	`_includeExpression = GetInclude(parameterValue.ToString());`
`53`	`51`	`}`
`54`	`52`	`catch (QueryParseException exception)`
`55`	`53`	`{`
`56`		`- // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment`
`57`		`- // ReSharper disable once AssignNullToNotNullAttribute`
`58`	`54`	`string specificMessage = exception.GetMessageWithPosition(parameterValue.ToString());`
`59`	`55`	`throw new InvalidQueryStringParameterException(parameterName, "The specified include is invalid.", specificMessage, exception);`
`60`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,6 @@ public virtual void Read(string parameterName, StringValues parameterValue)`
`58`	`58`
`59`	`59`	`try`
`60`	`60`	`{`
`61`		`- // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment`
`62`		`- // ReSharper disable once AssignNullToNotNullAttribute`
`63`	`61`	`PaginationQueryStringValueExpression constraint = GetPageConstraint(parameterValue.ToString());`
`64`	`62`
`65`	`63`	`if (constraint.Elements.Any(element => element.Scope == null))`
`@@ -82,8 +80,6 @@ public virtual void Read(string parameterName, StringValues parameterValue)`
`82`	`80`	`}`
`83`	`81`	`catch (QueryParseException exception)`
`84`	`82`	`{`
`85`		`- // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment`
`86`		`- // ReSharper disable once AssignNullToNotNullAttribute`
`87`	`83`	`string specificMessage = exception.GetMessageWithPosition(isParameterNameValid ? parameterValue.ToString() : parameterName);`
`88`	`84`	`throw new InvalidQueryStringParameterException(parameterName, "The specified pagination is invalid.", specificMessage, exception);`
`89`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,16 +59,12 @@ public virtual void Read(string parameterName, StringValues parameterValue)`
`59`	`59`	`ResourceFieldChainExpression? scope = GetScope(parameterName);`
`60`	`60`	`parameterNameIsValid = true;`
`61`	`61`
`62`		`- // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment`
`63`		`- // ReSharper disable once AssignNullToNotNullAttribute`
`64`	`62`	`SortExpression sort = GetSort(parameterValue.ToString(), scope);`
`65`	`63`	`var expressionInScope = new ExpressionInScope(scope, sort);`
`66`	`64`	`_constraints.Add(expressionInScope);`
`67`	`65`	`}`
`68`	`66`	`catch (QueryParseException exception)`
`69`	`67`	`{`
`70`		`- // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment`
`71`		`- // ReSharper disable once AssignNullToNotNullAttribute`
`72`	`68`	`string specificMessage = exception.GetMessageWithPosition(parameterNameIsValid ? parameterValue.ToString() : parameterName);`
`73`	`69`	`throw new InvalidQueryStringParameterException(parameterName, "The specified sort is invalid.", specificMessage, exception);`
`74`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,15 +63,11 @@ public virtual void Read(string parameterName, StringValues parameterValue)`
`63`	`63`	`ResourceType resourceType = GetScope(parameterName);`
`64`	`64`	`parameterNameIsValid = true;`
`65`	`65`
`66`		`- // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment`
`67`		`- // ReSharper disable once AssignNullToNotNullAttribute`
`68`	`66`	`SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue.ToString(), resourceType);`
`69`	`67`	`_sparseFieldTableBuilder[resourceType] = sparseFieldSet;`
`70`	`68`	`}`
`71`	`69`	`catch (QueryParseException exception)`
`72`	`70`	`{`
`73`		`- // Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment`
`74`		`- // ReSharper disable once AssignNullToNotNullAttribute`
`75`	`71`	`string specificMessage = exception.GetMessageWithPosition(parameterNameIsValid ? parameterValue.ToString() : parameterName);`
`76`	`72`	`throw new InvalidQueryStringParameterException(parameterName, "The specified fieldset is invalid.", specificMessage, exception);`
`77`	`73`	`}`