Skip to content

Commit 305d917

Browse files
rose-arose-a
committed
remove default serializer
1 parent 843aec9 commit 305d917

File tree

10 files changed

+26
-65
lines changed

10 files changed

+26
-65
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Be careful when using `byte[]` in your variables object, as most JSON serializer
5151
### Execute Query/Mutation:
5252

5353
```csharp
54-
var graphQLClient = new GraphQLHttpClient("https://swapi.apis.guru/");
54+
var graphQLClient = new GraphQLHttpClient("https://swapi.apis.guru/", new NewtonsoftJsonSerializer());
5555

5656
public class PersonAndFilmsResponse {
5757
public PersonContent Person { get; set; }

‎examples/GraphQL.Client.Example/Program.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Text.Json;
44
using System.Threading.Tasks;
55
using GraphQL.Client.Http;
6+
using GraphQL.Client.Serializer.Newtonsoft;
67

78
namespace GraphQL.Client.Example
89
{
@@ -13,7 +14,7 @@ public class Program
1314
public static async Task Main(string[] args)
1415
{
1516
_ = args;
16-
using var graphQLClient = new GraphQLHttpClient("https://swapi.apis.guru/");
17+
using var graphQLClient = new GraphQLHttpClient("https://swapi.apis.guru/", new NewtonsoftJsonSerializer());
1718

1819
var personAndFilmsRequest = new GraphQLRequest
1920
{

‎src/GraphQL.Client/GraphQL.Client.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<ItemGroup>
3737
<ProjectReference Include="..\GraphQL.Client.Abstractions.Websocket\GraphQL.Client.Abstractions.Websocket.csproj" />
3838
<ProjectReference Include="..\GraphQL.Client.Abstractions\GraphQL.Client.Abstractions.csproj" />
39-
<ProjectReference Include="..\GraphQL.Client.Serializer.Newtonsoft\GraphQL.Client.Serializer.Newtonsoft.csproj" />
4039
</ItemGroup>
4140

4241

‎src/GraphQL.Client/GraphQLHttpClient.cs‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ public class GraphQLHttpClient : IGraphQLClient
1919
private readonly GraphQLHttpWebSocket _graphQlHttpWebSocket;
2020
private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
2121
private readonly ConcurrentDictionary<Tuple<GraphQLRequest, Type>, object> _subscriptionStreams = new ConcurrentDictionary<Tuple<GraphQLRequest, Type>, object>();
22-
private IGraphQLWebsocketJsonSerializer JsonSerializer => Options.JsonSerializer;
22+
23+
/// <summary>
24+
/// the json serializer
25+
/// </summary>
26+
public IGraphQLWebsocketJsonSerializer JsonSerializer { get; }
2327

2428
/// <summary>
2529
/// the instance of <see cref="HttpClient"/> which is used internally
@@ -44,20 +48,18 @@ public class GraphQLHttpClient : IGraphQLClient
4448

4549
#region Constructors
4650

47-
public GraphQLHttpClient(string endPoint) : this(new Uri(endPoint)) { }
48-
49-
public GraphQLHttpClient(Uri endPoint) : this(o => o.EndPoint = endPoint) { }
50-
51-
public GraphQLHttpClient(Action<GraphQLHttpClientOptions> configure) : this(configure.New()) { }
51+
public GraphQLHttpClient(string endPoint, IGraphQLWebsocketJsonSerializer serializer) : this(new Uri(endPoint), serializer) { }
5252

53-
public GraphQLHttpClient(GraphQLHttpClientOptions options) : this(options, new HttpClient(options.HttpMessageHandler)) { }
53+
public GraphQLHttpClient(Uri endPoint, IGraphQLWebsocketJsonSerializer serializer) : this(o => o.EndPoint = endPoint, serializer) { }
5454

55-
public GraphQLHttpClient(GraphQLHttpClientOptions options, HttpClient httpClient) : this(options, httpClient, new NewtonsoftJsonSerializer()) { }
55+
public GraphQLHttpClient(Action<GraphQLHttpClientOptions> configure, IGraphQLWebsocketJsonSerializer serializer) : this(configure.New(), serializer) { }
5656

57-
public GraphQLHttpClient(GraphQLHttpClientOptions options, HttpClient httpClient, IGraphQLWebsocketJsonSerializer serializer)
57+
public GraphQLHttpClient(GraphQLHttpClientOptions options, IGraphQLWebsocketJsonSerializer serializer) : this(options, serializer, new HttpClient(options.HttpMessageHandler)) { }
58+
59+
public GraphQLHttpClient(GraphQLHttpClientOptions options, IGraphQLWebsocketJsonSerializer serializer, HttpClient httpClient)
5860
{
5961
Options = options ?? throw new ArgumentNullException(nameof(options));
60-
Options.JsonSerializer = serializer ?? throw new ArgumentNullException(nameof(serializer));
62+
JsonSerializer = serializer ?? throw new ArgumentNullException(nameof(serializer));
6163
HttpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
6264
_graphQlHttpWebSocket = new GraphQLHttpWebSocket(GetWebSocketUri(), this);
6365
}

‎src/GraphQL.Client/GraphQLHttpClientOptions.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Net.Http;
33
using System.Net.Http.Headers;
44
using System.Threading.Tasks;
5-
using GraphQL.Client.Abstractions.Websocket;
65

76
namespace GraphQL.Client.Http
87
{
@@ -18,11 +17,6 @@ public class GraphQLHttpClientOptions
1817
/// </summary>
1918
public Uri EndPoint { get; set; }
2019

21-
/// <summary>
22-
/// the json serializer
23-
/// </summary>
24-
public IGraphQLWebsocketJsonSerializer JsonSerializer { get; set; }
25-
2620
/// <summary>
2721
/// The <see cref="System.Net.Http.HttpMessageHandler"/> that is going to be used
2822
/// </summary>

‎src/GraphQL.Client/HttpClientExtensions.cs‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/GraphQL.Client/Websocket/GraphQLHttpWebSocket.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionStream<TRespons
139139
// post the GraphQLResponse to the stream (even if a GraphQL error occurred)
140140
Debug.WriteLine($"received payload on subscription {startRequest.Id} (thread {Thread.CurrentThread.ManagedThreadId})");
141141
var typedResponse =
142-
_client.Options.JsonSerializer.DeserializeToWebsocketResponse<TResponse>(
142+
_client.JsonSerializer.DeserializeToWebsocketResponse<TResponse>(
143143
response.MessageBytes);
144144
o.OnNext(typedResponse.Payload);
145145

@@ -296,7 +296,7 @@ public Task<GraphQLResponse<TResponse>> SendRequest<TResponse>(GraphQLRequest re
296296
{
297297
Debug.WriteLine($"received response for request {websocketRequest.Id}");
298298
var typedResponse =
299-
_client.Options.JsonSerializer.DeserializeToWebsocketResponse<TResponse>(
299+
_client.JsonSerializer.DeserializeToWebsocketResponse<TResponse>(
300300
response.MessageBytes);
301301
return typedResponse.Payload;
302302
});
@@ -353,7 +353,7 @@ private async Task SendWebSocketRequestAsync(GraphQLWebSocketRequest request)
353353
}
354354

355355
await InitializeWebSocket();
356-
var requestBytes = Options.JsonSerializer.SerializeToBytes(request);
356+
var requestBytes = _client.JsonSerializer.SerializeToBytes(request);
357357
await _clientWebSocket.SendAsync(
358358
new ArraySegment<byte>(requestBytes),
359359
WebSocketMessageType.Text,
@@ -554,7 +554,7 @@ private async Task<WebsocketMessageWrapper> ReceiveWebsocketMessagesAsync()
554554

555555
if (webSocketReceiveResult.MessageType == WebSocketMessageType.Text)
556556
{
557-
var response = await Options.JsonSerializer.DeserializeToWebsocketResponseWrapperAsync(ms);
557+
var response = await _client.JsonSerializer.DeserializeToWebsocketResponseWrapperAsync(ms);
558558
response.MessageBytes = ms.ToArray();
559559
Debug.WriteLine($"{response.MessageBytes.Length} bytes received for id {response.Id} on websocket {_clientWebSocket.GetHashCode()} (thread {Thread.CurrentThread.ManagedThreadId})...");
560560
return response;

‎tests/GraphQL.Integration.Tests/Extensions/WebApplicationFactoryExtensions.cs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎tests/GraphQL.Integration.Tests/GraphQL.Integration.Tests.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@
2828
<ProjectReference Include="..\IntegrationTestServer\IntegrationTestServer.csproj" />
2929
</ItemGroup>
3030

31+
<ItemGroup>
32+
<Folder Include="Extensions\" />
33+
</ItemGroup>
34+
3135
</Project>

‎tests/GraphQL.Integration.Tests/Helpers/WebHostHelpers.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public static GraphQLHttpClient GetGraphQLClient(int port, string endpoint, bool
4141
=> new GraphQLHttpClient(new GraphQLHttpClientOptions
4242
{
4343
EndPoint = new Uri($"http://localhost:{port}{endpoint}"),
44-
UseWebSocketForQueriesAndMutations = requestsViaWebsocket,
45-
JsonSerializer = serializer ?? new NewtonsoftJsonSerializer()
46-
});
44+
UseWebSocketForQueriesAndMutations = requestsViaWebsocket
45+
},
46+
serializer ?? new NewtonsoftJsonSerializer());
4747
}
4848

4949
public class TestServerSetup : IDisposable

0 commit comments

Comments
 (0)