From ea9fc9f9cc3c269f55768882c631e8022ccb232d Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Sun, 19 Dec 2021 02:17:32 +0100 Subject: Remove unreachable branches from JsonConverters * If the type is a reference type we don't have to handle null ourselves * reader.ValueSpan is only valid if reader.HasValueSequence is false --- .../Json/Converters/JsonStringConverter.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/Jellyfin.Extensions/Json/Converters/JsonStringConverter.cs') diff --git a/src/Jellyfin.Extensions/Json/Converters/JsonStringConverter.cs b/src/Jellyfin.Extensions/Json/Converters/JsonStringConverter.cs index 1a7a8c4f5..36b36c9b4 100644 --- a/src/Jellyfin.Extensions/Json/Converters/JsonStringConverter.cs +++ b/src/Jellyfin.Extensions/Json/Converters/JsonStringConverter.cs @@ -13,20 +13,11 @@ namespace Jellyfin.Extensions.Json.Converters { /// public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - return reader.TokenType switch - { - JsonTokenType.Null => null, - JsonTokenType.String => reader.GetString(), - _ => GetRawValue(reader) - }; - } + => reader.TokenType == JsonTokenType.String ? reader.GetString() : GetRawValue(reader); /// public override void Write(Utf8JsonWriter writer, string? value, JsonSerializerOptions options) - { - writer.WriteStringValue(value); - } + => writer.WriteStringValue(value); private static string GetRawValue(Utf8JsonReader reader) { -- cgit v1.2.3