From bdf0dbde1ec697df0feccad489f1869c83c5f42f Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Fri, 16 Apr 2021 00:49:57 -0700 Subject: [PATCH] chore(json): Cleans up json converters (#576) --- .../Converters/JsonNullableEnumConverter.cs | 51 ------------------- .../JsonNullableEnumConverterFactory.cs | 38 -------------- .../Converters/NullableStructSerializer.cs | 37 -------------- .../NullableStructSerializerFactory.cs | 39 -------------- Projects/Server/Json/JsonConfig.cs | 3 -- 5 files changed, 168 deletions(-) delete mode 100644 Projects/Server/Json/Converters/JsonNullableEnumConverter.cs delete mode 100644 Projects/Server/Json/Converters/JsonNullableEnumConverterFactory.cs delete mode 100644 Projects/Server/Json/Converters/NullableStructSerializer.cs delete mode 100644 Projects/Server/Json/Converters/NullableStructSerializerFactory.cs diff --git a/Projects/Server/Json/Converters/JsonNullableEnumConverter.cs b/Projects/Server/Json/Converters/JsonNullableEnumConverter.cs deleted file mode 100644 index 599866e1b..000000000 --- a/Projects/Server/Json/Converters/JsonNullableEnumConverter.cs +++ /dev/null @@ -1,51 +0,0 @@ -/************************************************************************* - * ModernUO * - * Copyright 2019-2021 - ModernUO Development Team * - * Email: hi@modernuo.com * - * File: JsonNullableEnumConverter.cs * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 3 of the License, or * - * (at your option) any later version. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *************************************************************************/ - -using System; -using System.Text.Json; -using System.Text.Json.Serialization; - -namespace Server.Json.Converters -{ - class JsonNullableEnumConverter : JsonConverter where T : struct, Enum - { - private readonly JsonConverter _converter; - - public JsonNullableEnumConverter(JsonConverter converter) => _converter = converter; - - public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType == JsonTokenType.Null) - { - reader.Read(); - return null; - } - - return _converter.Read(ref reader, typeof(T), options); - } - - public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options) - { - if (value == null) - { - writer.WriteNullValue(); - } - else - { - _converter.Write(writer, value.Value, options); - } - } - } -} diff --git a/Projects/Server/Json/Converters/JsonNullableEnumConverterFactory.cs b/Projects/Server/Json/Converters/JsonNullableEnumConverterFactory.cs deleted file mode 100644 index 73c0f532e..000000000 --- a/Projects/Server/Json/Converters/JsonNullableEnumConverterFactory.cs +++ /dev/null @@ -1,38 +0,0 @@ -/************************************************************************* - * ModernUO * - * Copyright 2019-2021 - ModernUO Development Team * - * Email: hi@modernuo.com * - * File: JsonNullableEnumConverterFactory.cs * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 3 of the License, or * - * (at your option) any later version. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *************************************************************************/ - -using System; -using System.Text.Json; -using System.Text.Json.Serialization; - -namespace Server.Json.Converters -{ - public class JsonNullableEnumConverterFactory : JsonConverterFactory - { - private readonly JsonStringEnumConverter _stringEnumConverter; - - public JsonNullableEnumConverterFactory(JsonNamingPolicy? namingPolicy = null, bool allowIntegerValues = true) => - _stringEnumConverter = new JsonStringEnumConverter(namingPolicy, allowIntegerValues); - - public override bool CanConvert(Type typeToConvert) => Nullable.GetUnderlyingType(typeToConvert)?.IsEnum == true; - - public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) - { - var type = Nullable.GetUnderlyingType(typeToConvert); - return (JsonConverter?)Activator.CreateInstance(typeof(JsonNullableEnumConverter<>).MakeGenericType(type!), - _stringEnumConverter.CreateConverter(type, options)); - } - } -} diff --git a/Projects/Server/Json/Converters/NullableStructSerializer.cs b/Projects/Server/Json/Converters/NullableStructSerializer.cs deleted file mode 100644 index eae088e3c..000000000 --- a/Projects/Server/Json/Converters/NullableStructSerializer.cs +++ /dev/null @@ -1,37 +0,0 @@ -/************************************************************************* - * ModernUO * - * Copyright 2019-2020 - ModernUO Development Team * - * Email: hi@modernuo.com * - * File: NullableStructSerializer.cs * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 3 of the License, or * - * (at your option) any later version. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *************************************************************************/ - -namespace System.Text.Json.Serialization -{ - public class NullableStructSerializer : JsonConverter where TStruct : struct - { - public override TStruct? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => - reader.TokenType == JsonTokenType.Null - ? default - : JsonSerializer.Deserialize(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); - } - } - } -} diff --git a/Projects/Server/Json/Converters/NullableStructSerializerFactory.cs b/Projects/Server/Json/Converters/NullableStructSerializerFactory.cs deleted file mode 100644 index 5c6824aad..000000000 --- a/Projects/Server/Json/Converters/NullableStructSerializerFactory.cs +++ /dev/null @@ -1,39 +0,0 @@ -/************************************************************************* - * ModernUO * - * Copyright 2019-2020 - ModernUO Development Team * - * Email: hi@modernuo.com * - * File: NullableStructSerializerFactory.cs * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 3 of the License, or * - * (at your option) any later version. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *************************************************************************/ - -using Server; - -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.StartsWithOrdinal(nameof(System)) && !structType.IsEnum; - } - - public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options) => - (JsonConverter)Activator.CreateInstance( - typeof(NullableStructSerializer<>).MakeGenericType(typeToConvert.GenericTypeArguments[0]) - ); - } -} diff --git a/Projects/Server/Json/JsonConfig.cs b/Projects/Server/Json/JsonConfig.cs index f14a534ba..a2df7b6e1 100644 --- a/Projects/Server/Json/JsonConfig.cs +++ b/Projects/Server/Json/JsonConfig.cs @@ -19,7 +19,6 @@ using System.IO; using System.Text.Encodings.Web; using System.Text.Json; using System.Text.Json.Serialization; -using Server.Json.Converters; using Server.Text; namespace Server.Json @@ -40,14 +39,12 @@ namespace Server.Json Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping }; - options.Converters.Add(new JsonNullableEnumConverterFactory()); options.Converters.Add(new JsonStringEnumConverter()); options.Converters.Add(new MapConverterFactory()); options.Converters.Add(new Point3DConverterFactory()); options.Converters.Add(new Rectangle3DConverterFactory()); options.Converters.Add(new TimeSpanConverterFactory()); options.Converters.Add(new IPEndPointConverterFactory()); - options.Converters.Add(new NullableStructSerializerFactory()); options.Converters.Add(new TypeConverterFactory()); options.Converters.Add(new WorldLocationConverterFactory());