Skip to content

Commit 705bcd8

Browse files
author
Bart Koelman
committed
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.
1 parent fd1437c commit 705bcd8

File tree

6 files changed

+11
-4
lines changed

6 files changed

+11
-4
lines changed

src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationObject.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Collections.Generic;
22
using Newtonsoft.Json;
3-
using Newtonsoft.Json.Converters;
43

54
namespace JsonApiDotNetCore.Serialization.Objects
65
{
@@ -13,7 +12,6 @@ public sealed class AtomicOperationObject : ExposableData<ResourceObject>
1312
public IDictionary<string, object> Meta { get; set; }
1413

1514
[JsonProperty("op")]
16-
[JsonConverter(typeof(StringEnumConverter))]
1715
public AtomicOperationCode Code { get; set; }
1816

1917
[JsonProperty("ref", NullValueHandling = NullValueHandling.Ignore)]

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using JsonApiDotNetCore.Configuration;
1111
using JsonApiDotNetCore.Serialization.Objects;
1212
using Microsoft.Extensions.DependencyInjection;
13+
using Newtonsoft.Json.Converters;
1314
using TestBuildingBlocks;
1415
using Xunit;
1516

@@ -27,6 +28,7 @@ public FilterDataTypeTests(IntegrationTestContext<TestableStartup<FilterDbContex
2728

2829
var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
2930
options.EnableLegacyFilterNotation = false;
31+
options.SerializerSettings.Converters.Add(new StringEnumConverter());
3032
}
3133

3234
[Theory]

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
using JetBrains.Annotations;
2+
using Newtonsoft.Json;
3+
using Newtonsoft.Json.Converters;
24

35
namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
46
{
57
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[JsonConverter(typeof(StringEnumConverter))]
69
public enum LabelColor
710
{
811
Red,

test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
using JetBrains.Annotations;
2+
using Newtonsoft.Json;
3+
using Newtonsoft.Json.Converters;
24

35
namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
46
{
57
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[JsonConverter(typeof(StringEnumConverter))]
69
public enum WorkItemPriority
710
{
811
Low,

test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
using JetBrains.Annotations;
2+
using Newtonsoft.Json;
3+
using Newtonsoft.Json.Converters;
24

35
namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
46
{
57
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[JsonConverter(typeof(StringEnumConverter))]
69
public enum StarKind
710
{
811
Other,

test/TestBuildingBlocks/TestableStartup.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Microsoft.Extensions.DependencyInjection;
66
using Microsoft.Extensions.Logging;
77
using Newtonsoft.Json;
8-
using Newtonsoft.Json.Converters;
98

109
namespace TestBuildingBlocks
1110
{
@@ -21,7 +20,6 @@ protected virtual void SetJsonApiOptions(JsonApiOptions options)
2120
{
2221
options.IncludeExceptionStackTraceInErrors = true;
2322
options.SerializerSettings.Formatting = Formatting.Indented;
24-
options.SerializerSettings.Converters.Add(new StringEnumConverter());
2523
}
2624

2725
public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)

0 commit comments

Comments
 (0)