Removed unneeded StringEnumConverter usage. Also removed it from the …

…defaults for tests, because that hides the problem when we forget to put it on a member that needs it.
json-api-dotnet · Sep 10, 2021 · 705bcd8 · 705bcd8
1 parent fd1437c
commit 705bcd8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationObject.cs b/src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationObject.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 
 namespace JsonApiDotNetCore.Serialization.Objects
 {
@@ -13,7 +12,6 @@ public sealed class AtomicOperationObject : ExposableData<ResourceObject>
         public IDictionary<string, object> Meta { get; set; }
 
         [JsonProperty("op")]
-        [JsonConverter(typeof(StringEnumConverter))]
         public AtomicOperationCode Code { get; set; }
 
         [JsonProperty("ref", NullValueHandling = NullValueHandling.Ignore)]

diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs
@@ -10,6 +10,7 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json.Converters;
 using TestBuildingBlocks;
 using Xunit;
 
@@ -27,6 +28,7 @@ public FilterDataTypeTests(IntegrationTestContext<TestableStartup<FilterDbContex
 
             var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
             options.EnableLegacyFilterNotation = false;
+            options.SerializerSettings.Converters.Add(new StringEnumConverter());
         }
 
         [Theory]

diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs
@@ -1,8 +1,11 @@
 using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum LabelColor
     {
         Red,

diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs
@@ -1,8 +1,11 @@
 using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum WorkItemPriority
     {
         Low,

diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs
@@ -1,8 +1,11 @@
 using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
 {
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum StarKind
     {
         Other,

diff --git a/test/TestBuildingBlocks/TestableStartup.cs b/test/TestBuildingBlocks/TestableStartup.cs
@@ -5,7 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 
 namespace TestBuildingBlocks
 {
@@ -21,7 +20,6 @@ protected virtual void SetJsonApiOptions(JsonApiOptions options)
         {
             options.IncludeExceptionStackTraceInErrors = true;
             options.SerializerSettings.Formatting = Formatting.Indented;
-            options.SerializerSettings.Converters.Add(new StringEnumConverter());
         }
 
         public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)