warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Adds support for nullable structs (#203)

Browse source
This commit is contained in:
Kamron Batman 2020-08-29 18:47:00 -07:00 • committed by GitHub
parent 259fdb5ae8
commit c4e7f47ada
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Projects/Server/JsonConfiguration/Converters/NullableStructSerializer.cs Normal file
View file

@ -0,0 +1,18 @@
namespace System.Text.Json.Serialization
{
public class NullableStructSerializer<TStruct> : JsonConverter<TStruct?> where TStruct : struct
{
public override TStruct? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
reader.TokenType == JsonTokenType.Null
? default
: JsonSerializer.Deserialize<TStruct>(ref reader, options);
public override void Write(Utf8JsonWriter writer, TStruct? value, JsonSerializerOptions options)
{
if (value == null)
writer.WriteNullValue();
else
JsonSerializer.Serialize(writer, value.Value, options);
}
}
}

19
Projects/Server/JsonConfiguration/Converters/NullableStructSerializerFactory.cs Normal file
View file

@ -0,0 +1,19 @@
namespace System.Text.Json.Serialization
{
public class NullableStructSerializerFactory : JsonConverterFactory
{
public override bool CanConvert(Type typeToConvert)
{
if (!typeToConvert.IsGenericType || typeToConvert.GetGenericTypeDefinition() != typeof(Nullable<>))
return false;
var structType = typeToConvert.GenericTypeArguments[0];
return !structType.IsPrimitive && structType.Namespace?.StartsWith(nameof(System)) != true && !structType.IsEnum;
}
public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options) =>
(JsonConverter)Activator.CreateInstance(
typeof(NullableStructSerializer<>).MakeGenericType(typeToConvert.GenericTypeArguments[0])
);
}
}

1
Projects/Server/JsonConfiguration/JsonConfig.cs
View file

@ -46,6 +46,7 @@ namespace Server.Json
options.Converters.Add(new Rectangle3DConverterFactory());
options.Converters.Add(new TimeSpanConverterFactory());
options.Converters.Add(new IPEndPointConverterFactory());
options.Converters.Add(new NullableStructSerializerFactory());
for (var i = 0; i < converters.Length; i++) options.Converters.Add(converters[i]);