starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-29 20:24:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Enable nullable reference types for MediaBrowser.Common

Browse Source
This commit is contained in:
Bond_009
2021-05-05 12:57:01 +02:00
parent 48e81e65e8
commit 91c2a57b28
43 changed files with 78 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Common/Json/Converters/JsonPipeDelimitedArrayConverter.cs
View File

@@ -24,10 +24,16 @@ namespace MediaBrowser.Common.Json.Converters
/// <inheritdoc />
public override T[] Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
if (reader.TokenType == JsonTokenType.Null)
{
return Array.Empty<T>();
}
if (reader.TokenType == JsonTokenType.String)
{
var stringEntries = reader.GetString()?.Split('|', StringSplitOptions.RemoveEmptyEntries);
if (stringEntries == null || stringEntries.Length == 0)
// GetString can't return null here because we already handled it above
var stringEntries = reader.GetString()!.Split('|', StringSplitOptions.RemoveEmptyEntries);
if (stringEntries.Length == 0)
{
return Array.Empty<T>();
}
@@ -63,7 +69,8 @@ namespace MediaBrowser.Common.Json.Converters
return typedValues;
}
return JsonSerializer.Deserialize<T[]>(ref reader, options);
// can't return null here because we already handled it above
return JsonSerializer.Deserialize<T[]>(ref reader, options)!;
}
/// <inheritdoc />