From b0ae4e9a609b2b5f4043f11eb8575bc62bd5a0e6 Mon Sep 17 00:00:00 2001 From: ta264 Date: Mon, 16 Dec 2019 21:09:39 +0000 Subject: [PATCH] Fixed: Serialize flag enum as string also --- .../Converters/EmbeddedDocumentConverter.cs | 2 +- .../Converters/NoFlagsStringEnumConverter.cs | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 src/NzbDrone.Core/Datastore/Converters/NoFlagsStringEnumConverter.cs diff --git a/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs b/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs index 92a634cdd..f24cc9b8b 100644 --- a/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs +++ b/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs @@ -21,7 +21,7 @@ namespace NzbDrone.Core.Datastore.Converters WriteIndented = true }; - serializerSettings.Converters.Add(new NoFlagsStringEnumConverter()); + serializerSettings.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase, true)); serializerSettings.Converters.Add(new TimeSpanConverter()); serializerSettings.Converters.Add(new UtcConverter()); diff --git a/src/NzbDrone.Core/Datastore/Converters/NoFlagsStringEnumConverter.cs b/src/NzbDrone.Core/Datastore/Converters/NoFlagsStringEnumConverter.cs deleted file mode 100644 index bd30b659c..000000000 --- a/src/NzbDrone.Core/Datastore/Converters/NoFlagsStringEnumConverter.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Text.Json; -using System.Text.Json.Serialization; - -namespace NzbDrone.Core.Datastore.Converters -{ - public class NoFlagsStringEnumConverter : JsonConverterFactory - { - private static JsonStringEnumConverter s_stringEnumConverter = new JsonStringEnumConverter(JsonNamingPolicy.CamelCase, false); - - public override bool CanConvert(Type typeToConvert) - => typeToConvert.IsEnum && !typeToConvert.IsDefined(typeof(FlagsAttribute), inherit: false); - - public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options) - => s_stringEnumConverter.CreateConverter(typeToConvert, options); - } -}