Skip to content

Commit f6e2616

Browse files
committed
Adapt for corrected nullability annotation
The return value of `implicit operator string(StringValues values)` has changed to nullable in .NET 8. However the implementation did not change. So adapt our code to use `ToString()` instead, which never returns null.
1 parent 1535b64 commit f6e2616

4 files changed

+4
-4
lines changed

src/JsonApiDotNetCore/QueryStrings/IncludeQueryStringParameterReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)
5151
}
5252
catch (QueryParseException exception)
5353
{
54-
string specificMessage = exception.GetMessageWithPosition(parameterValue);
54+
string specificMessage = exception.GetMessageWithPosition(parameterValue.ToString());
5555
throw new InvalidQueryStringParameterException(parameterName, "The specified include is invalid.", specificMessage, exception);
5656
}
5757
}

src/JsonApiDotNetCore/QueryStrings/PaginationQueryStringParameterReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)
8080
}
8181
catch (QueryParseException exception)
8282
{
83-
string specificMessage = exception.GetMessageWithPosition(isParameterNameValid ? parameterValue : parameterName);
83+
string specificMessage = exception.GetMessageWithPosition(isParameterNameValid ? parameterValue.ToString() : parameterName);
8484
throw new InvalidQueryStringParameterException(parameterName, "The specified pagination is invalid.", specificMessage, exception);
8585
}
8686
}

src/JsonApiDotNetCore/QueryStrings/SortQueryStringParameterReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)
6565
}
6666
catch (QueryParseException exception)
6767
{
68-
string specificMessage = exception.GetMessageWithPosition(parameterNameIsValid ? parameterValue : parameterName);
68+
string specificMessage = exception.GetMessageWithPosition(parameterNameIsValid ? parameterValue.ToString() : parameterName);
6969
throw new InvalidQueryStringParameterException(parameterName, "The specified sort is invalid.", specificMessage, exception);
7070
}
7171
}

src/JsonApiDotNetCore/QueryStrings/SparseFieldSetQueryStringParameterReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public virtual void Read(string parameterName, StringValues parameterValue)
6868
}
6969
catch (QueryParseException exception)
7070
{
71-
string specificMessage = exception.GetMessageWithPosition(parameterNameIsValid ? parameterValue : parameterName);
71+
string specificMessage = exception.GetMessageWithPosition(parameterNameIsValid ? parameterValue.ToString() : parameterName);
7272
throw new InvalidQueryStringParameterException(parameterName, "The specified fieldset is invalid.", specificMessage, exception);
7373
}
7474
}

0 commit comments

Comments
 (0)