Skip to content

Commit 88e2074

Browse files
author
Bart Koelman
committed
Removed external JsonTimeSpanConverter (TimeSpan support was added in .NET 6)
1 parent affef06 commit 88e2074

File tree

6 files changed

+5
-13
lines changed

6 files changed

+5
-13
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ public FilterDataTypeTests(IntegrationTestContext<TestableStartup<FilterDbContex
2626
var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
2727
options.EnableLegacyFilterNotation = false;
2828

29-
if (!options.SerializerOptions.Converters.Any(converter => converter is JsonStringEnumMemberConverter))
29+
if (!options.SerializerOptions.Converters.Any(converter => converter is JsonStringEnumConverter))
3030
{
31-
options.SerializerOptions.Converters.Add(new JsonStringEnumMemberConverter());
32-
options.SerializerOptions.Converters.Add(new JsonTimeSpanConverter());
31+
options.SerializerOptions.Converters.Add(new JsonStringEnumConverter());
3332
}
3433
}
3534

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
55

66
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
7-
[JsonConverter(typeof(JsonStringEnumMemberConverter))]
7+
[JsonConverter(typeof(JsonStringEnumConverter))]
88
public enum LabelColor
99
{
1010
Red,

test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
55

66
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
7-
[JsonConverter(typeof(JsonStringEnumMemberConverter))]
7+
[JsonConverter(typeof(JsonStringEnumConverter))]
88
public enum WorkItemPriority
99
{
1010
Low,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
55

66
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
7-
[JsonConverter(typeof(JsonStringEnumMemberConverter))]
7+
[JsonConverter(typeof(JsonStringEnumConverter))]
88
public enum StarKind
99
{
1010
Other,

test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Globalization;
22
using System.Net;
3-
using System.Text.Json.Serialization;
43
using FluentAssertions;
54
using JsonApiDotNetCore.Configuration;
65
using JsonApiDotNetCore.Resources;
@@ -34,11 +33,6 @@ public SerializationTests(IntegrationTestContext<TestableStartup<SerializationDb
3433
options.AllowClientGeneratedIds = true;
3534
options.IncludeJsonApiVersion = false;
3635
options.IncludeTotalResourceCount = true;
37-
38-
if (!options.SerializerOptions.Converters.Any(converter => converter is JsonTimeSpanConverter))
39-
{
40-
options.SerializerOptions.Converters.Add(new JsonTimeSpanConverter());
41-
}
4236
}
4337

4438
[Fact]

test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
20-
<PackageReference Include="Macross.Json.Extensions" Version="2.0.0" />
2120
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
2221
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
2322
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />

0 commit comments

Comments
 (0)