Fallback to base jsonconverter

pull/4033/head
crobibero 4 years ago
parent 1f2d73af8e
commit eb400f7292

@ -10,31 +10,32 @@ namespace MediaBrowser.Common.Json.Converters
/// </summary> /// </summary>
public class JsonNullableInt32Converter : JsonConverter<int?> public class JsonNullableInt32Converter : JsonConverter<int?>
{ {
private readonly JsonConverter<int?> _baseJsonConverter;
/// <summary>
/// Initializes a new instance of the <see cref="JsonNullableInt32Converter"/> class.
/// </summary>
/// <param name="baseJsonConverter">The base json converter.</param>
public JsonNullableInt32Converter(JsonConverter<int?> baseJsonConverter)
{
_baseJsonConverter = baseJsonConverter;
}
/// <inheritdoc /> /// <inheritdoc />
public override int? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) public override int? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{ {
switch (reader.TokenType) if (reader.TokenType == JsonTokenType.String && ((reader.HasValueSequence && reader.ValueSequence.IsEmpty) || reader.ValueSpan.IsEmpty))
{ {
case JsonTokenType.String when (reader.HasValueSequence && reader.ValueSequence.IsEmpty) || reader.ValueSpan.IsEmpty:
case JsonTokenType.Null:
return null; return null;
default:
// fallback to default handling
return reader.GetInt32();
} }
return _baseJsonConverter.Read(ref reader, typeToConvert, options);
} }
/// <inheritdoc /> /// <inheritdoc />
public override void Write(Utf8JsonWriter writer, int? value, JsonSerializerOptions options) public override void Write(Utf8JsonWriter writer, int? value, JsonSerializerOptions options)
{ {
if (value is null) _baseJsonConverter.Write(writer, value, options);
{
writer.WriteNullValue();
}
else
{
writer.WriteNumberValue(value.Value);
}
} }
} }
} }

@ -1,52 +1,42 @@
using System; using System;
using System.ComponentModel;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace MediaBrowser.Common.Json.Converters namespace MediaBrowser.Common.Json.Converters
{ {
/// <summary> /// <summary>
/// Parse JSON string as nullable long. /// Converts a nullable int64 object or value to/from JSON.
/// Javascript does not support 64-bit integers.
/// Required - some clients send an empty string. /// Required - some clients send an empty string.
/// </summary> /// </summary>
public class JsonNullableInt64Converter : JsonConverter<long?> public class JsonNullableInt64Converter : JsonConverter<long?>
{ {
private readonly JsonConverter<long?> _baseJsonConverter;
/// <summary> /// <summary>
/// Read JSON string as int64. /// Initializes a new instance of the <see cref="JsonNullableInt64Converter"/> class.
/// </summary> /// </summary>
/// <param name="reader"><see cref="Utf8JsonReader"/>.</param> /// <param name="baseJsonConverter">The base json converter.</param>
/// <param name="type">Type.</param> public JsonNullableInt64Converter(JsonConverter<long?> baseJsonConverter)
/// <param name="options">Options.</param> {
/// <returns>Parsed value.</returns> _baseJsonConverter = baseJsonConverter;
public override long? Read(ref Utf8JsonReader reader, Type type, JsonSerializerOptions options) }
/// <inheritdoc />
public override long? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{ {
switch (reader.TokenType) if (reader.TokenType == JsonTokenType.String && ((reader.HasValueSequence && reader.ValueSequence.IsEmpty) || reader.ValueSpan.IsEmpty))
{ {
case JsonTokenType.String when (reader.HasValueSequence && reader.ValueSequence.IsEmpty) || reader.ValueSpan.IsEmpty:
case JsonTokenType.Null:
return null; return null;
default:
// fallback to default handling
return reader.GetInt64();
} }
return _baseJsonConverter.Read(ref reader, typeToConvert, options);
} }
/// <summary> /// <inheritdoc />
/// Write long to JSON long.
/// </summary>
/// <param name="writer"><see cref="Utf8JsonWriter"/>.</param>
/// <param name="value">Value to write.</param>
/// <param name="options">Options.</param>
public override void Write(Utf8JsonWriter writer, long? value, JsonSerializerOptions options) public override void Write(Utf8JsonWriter writer, long? value, JsonSerializerOptions options)
{ {
if (value is null) _baseJsonConverter.Write(writer, value, options);
{
writer.WriteNullValue();
}
else
{
writer.WriteNumberValue(value.Value);
}
} }
} }
} }

@ -29,10 +29,14 @@ namespace MediaBrowser.Common.Json
NumberHandling = JsonNumberHandling.AllowReadingFromString NumberHandling = JsonNumberHandling.AllowReadingFromString
}; };
// Get built-in converters for fallback converting.
var baseNullableInt32Converter = (JsonConverter<int?>)options.GetConverter(typeof(int?));
var baseNullableInt64Converter = (JsonConverter<long?>)options.GetConverter(typeof(long?));
options.Converters.Add(new JsonGuidConverter()); options.Converters.Add(new JsonGuidConverter());
options.Converters.Add(new JsonStringEnumConverter()); options.Converters.Add(new JsonStringEnumConverter());
options.Converters.Add(new JsonNullableInt32Converter()); options.Converters.Add(new JsonNullableInt32Converter(baseNullableInt32Converter));
options.Converters.Add(new JsonNullableInt64Converter()); options.Converters.Add(new JsonNullableInt64Converter(baseNullableInt64Converter));
return options; return options;
} }

Loading…
Cancel
Save