Skip to content

Commit a087b15

Browse files
committed
1 parent 831e853 commit a087b15

4 files changed

+16
-0
lines changed

src/JsonApiDotNetCore/QueryStrings/IncludeQueryStringParameterReader.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,14 @@ public virtual void Read(string parameterName, StringValues parameterValue)
4747
{
4848
try
4949
{
50+
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
51+
// ReSharper disable once AssignNullToNotNullAttribute
5052
_includeExpression = GetInclude(parameterValue.ToString());
5153
}
5254
catch (QueryParseException exception)
5355
{
56+
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
57+
// ReSharper disable once AssignNullToNotNullAttribute
5458
string specificMessage = exception.GetMessageWithPosition(parameterValue.ToString());
5559
throw new InvalidQueryStringParameterException(parameterName, "The specified include is invalid.", specificMessage, exception);
5660
}

src/JsonApiDotNetCore/QueryStrings/PaginationQueryStringParameterReader.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ public virtual void Read(string parameterName, StringValues parameterValue)
5858

5959
try
6060
{
61+
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
62+
// ReSharper disable once AssignNullToNotNullAttribute
6163
PaginationQueryStringValueExpression constraint = GetPageConstraint(parameterValue.ToString());
6264

6365
if (constraint.Elements.Any(element => element.Scope == null))
@@ -80,6 +82,8 @@ public virtual void Read(string parameterName, StringValues parameterValue)
8082
}
8183
catch (QueryParseException exception)
8284
{
85+
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
86+
// ReSharper disable once AssignNullToNotNullAttribute
8387
string specificMessage = exception.GetMessageWithPosition(isParameterNameValid ? parameterValue.ToString() : parameterName);
8488
throw new InvalidQueryStringParameterException(parameterName, "The specified pagination is invalid.", specificMessage, exception);
8589
}

src/JsonApiDotNetCore/QueryStrings/SortQueryStringParameterReader.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,16 @@ public virtual void Read(string parameterName, StringValues parameterValue)
5959
ResourceFieldChainExpression? scope = GetScope(parameterName);
6060
parameterNameIsValid = true;
6161

62+
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
63+
// ReSharper disable once AssignNullToNotNullAttribute
6264
SortExpression sort = GetSort(parameterValue.ToString(), scope);
6365
var expressionInScope = new ExpressionInScope(scope, sort);
6466
_constraints.Add(expressionInScope);
6567
}
6668
catch (QueryParseException exception)
6769
{
70+
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
71+
// ReSharper disable once AssignNullToNotNullAttribute
6872
string specificMessage = exception.GetMessageWithPosition(parameterNameIsValid ? parameterValue.ToString() : parameterName);
6973
throw new InvalidQueryStringParameterException(parameterName, "The specified sort is invalid.", specificMessage, exception);
7074
}

src/JsonApiDotNetCore/QueryStrings/SparseFieldSetQueryStringParameterReader.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,15 @@ public virtual void Read(string parameterName, StringValues parameterValue)
6363
ResourceType resourceType = GetScope(parameterName);
6464
parameterNameIsValid = true;
6565

66+
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
67+
// ReSharper disable once AssignNullToNotNullAttribute
6668
SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue.ToString(), resourceType);
6769
_sparseFieldTableBuilder[resourceType] = sparseFieldSet;
6870
}
6971
catch (QueryParseException exception)
7072
{
73+
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-493256/Incorrect-possible-null-assignment
74+
// ReSharper disable once AssignNullToNotNullAttribute
7175
string specificMessage = exception.GetMessageWithPosition(parameterNameIsValid ? parameterValue.ToString() : parameterName);
7276
throw new InvalidQueryStringParameterException(parameterName, "The specified fieldset is invalid.", specificMessage, exception);
7377
}

0 commit comments

Comments
 (0)