Skip to content

Commit 86424d5

Browse files
committed
remove dependency on Dahomey.Json, add test with extension
1 parent 52c8731 commit 86424d5

File tree

5 files changed

+7
-20
lines changed

5 files changed

+7
-20
lines changed

src/GraphQL.Client.Serializer.SystemTextJson/GraphQL.Client.Serializer.SystemTextJson.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
<PackageReference Include="System.Text.Json" Version="4.7.0" />
1111
</ItemGroup>
1212

13-
<ItemGroup>
14-
<PackageReference Include="Dahomey.Json" Version="1.6.0" />
15-
</ItemGroup>
16-
1713
<ItemGroup>
1814
<ProjectReference Include="..\GraphQL.Client.Abstractions.Websocket\GraphQL.Client.Abstractions.Websocket.csproj" />
1915
</ItemGroup>

src/GraphQL.Client.Serializer.SystemTextJson/JsonSerializerOptionsExtensions.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
41
using System.Text.Json;
5-
using System.Text.Json.Serialization;
6-
using Dahomey.Json;
7-
using Dahomey.Json.Serialization.Converters.Factories;
82

93
namespace GraphQL.Client.Serializer.SystemTextJson {
104
public static class JsonSerializerOptionsExtensions {
11-
public static JsonSerializerOptions SetupDahomeyExtensions(
5+
public static JsonSerializerOptions SetupImmutableConverter(
126
this JsonSerializerOptions options) {
137
options.Converters.Add(new ImmutableConverter());
14-
//options.Converters.Add((JsonConverter)new JsonSerializerOptionsState(options));
15-
//options.Converters.Add((JsonConverter)new DictionaryConverterFactory());
16-
//options.Converters.Add((JsonConverter)new CollectionConverterFactory());
17-
//options.Converters.Add((JsonConverter)new JsonNodeConverterFactory());
18-
//options.Converters.Add((JsonConverter)new ObjectConverterFactory());
198
return options;
209
}
2110
}

src/GraphQL.Client.Serializer.SystemTextJson/SystemTextJsonSerializer.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Text.Json;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using Dahomey.Json;
76
using GraphQL.Client.Abstractions;
87
using GraphQL.Client.Abstractions.Websocket;
98

@@ -13,7 +12,7 @@ public class SystemTextJsonSerializer: IGraphQLWebsocketJsonSerializer
1312
{
1413
public static JsonSerializerOptions DefaultJsonSerializerOptions => new JsonSerializerOptions {
1514
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
16-
}.SetupDahomeyExtensions();
15+
}.SetupImmutableConverter();
1716

1817
public JsonSerializerOptions Options { get; }
1918

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Text.Json;
2-
using Dahomey.Json;
32
using GraphQL.Client.Serializer.SystemTextJson;
43

54
namespace GraphQL.Client.Serializer.Tests {
@@ -9,6 +8,6 @@ public SystemTextJsonSerializerTests() : base(new SystemTextJsonSerializer()) {
98

109
public class SystemTextJsonSerializeNoCamelCaseTest : BaseSerializeNoCamelCaseTest {
1110
public SystemTextJsonSerializeNoCamelCaseTest()
12-
: base(new SystemTextJsonSerializer(new JsonSerializerOptions().SetupDahomeyExtensions())) { }
11+
: base(new SystemTextJsonSerializer(new JsonSerializerOptions().SetupImmutableConverter())) { }
1312
}
1413
}

tests/GraphQL.Client.Serializer.Tests/TestData/SerializeToStringTestData.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ public IEnumerator<object[]> GetEnumerator() {
1313
"{\"query\":\"simplequerystring\",\"variables\":{\"camelCaseProperty\":\"camelCase\",\"PascalCaseProperty\":\"PascalCase\"},\"operationName\":null}",
1414
new GraphQLRequest("simple query string", new { camelCaseProperty = "camelCase", PascalCaseProperty = "PascalCase"})
1515
};
16+
yield return new object[] {
17+
"{\"query\":\"simplequerystring\",\"variables\":null,\"operationName\":null,\"authentication\":\"an-authentication-token\"}",
18+
new GraphQLRequest("simple query string"){{"authentication", "an-authentication-token"}}
19+
};
1620
}
1721

1822
IEnumerator IEnumerable.GetEnumerator() {

0 commit comments

Comments
 (0)