Skip to content

Commit e2402cb

Browse files
rose-arose-a
committed
fix naming for NewtonSoft
1 parent 2545928 commit e2402cb

File tree

9 files changed

+63
-21
lines changed

9 files changed

+63
-21
lines changed

‎src/GraphQL.Client.Serializer.Newtonsoft/GraphQLRequest.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using Newtonsoft.Json;
2+
3+
namespace GraphQL.Client.Serializer.Newtonsoft {
4+
public class GraphQLRequest: GraphQL.GraphQLRequest {
5+
[JsonProperty(QueryKey)]
6+
public override string Query { get; set; }
7+
[JsonProperty(OperationNameKey)]
8+
public override string? OperationName { get; set; }
9+
[JsonProperty(VariablesKey)]
10+
public override object? Variables { get; set; }
11+
12+
public GraphQLRequest() { }
13+
14+
public GraphQLRequest(GraphQL.GraphQLRequest other) {
15+
Query = other.Query;
16+
OperationName = other.OperationName;
17+
Variables = other.Variables;
18+
}
19+
20+
}
21+
}

‎src/GraphQL.Client.Serializer.Newtonsoft/GraphQLWebSocketRequest.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using Newtonsoft.Json;
2+
3+
namespace GraphQL.Client.Serializer.Newtonsoft {
4+
public class GraphQLWebSocketRequest: Abstractions.Websocket.GraphQLWebSocketRequest {
5+
6+
[JsonProperty(IdKey)]
7+
public override string Id { get; set; }
8+
[JsonProperty(TypeKey)]
9+
public override string Type { get; set; }
10+
[JsonProperty(PayloadKey)]
11+
public override GraphQL.GraphQLRequest Payload { get; set; }
12+
13+
public GraphQLWebSocketRequest()
14+
{
15+
}
16+
17+
public GraphQLWebSocketRequest(Abstractions.Websocket.GraphQLWebSocketRequest other) {
18+
Id = other.Id;
19+
Type = other.Type;
20+
Payload = new Newtonsoft.GraphQLRequest(other.Payload);
21+
}
22+
}
23+
}

‎src/GraphQL.Client.Serializer.Newtonsoft/NewtonsoftJsonSerializer.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ private void ConfigureMandatorySerializerOptions() {
2828
Options.JsonSerializerSettings.Converters.Insert(0, new GraphQLExtensionsConverter());
2929
}
3030

31-
public string SerializeToString(GraphQLRequest request) {
32-
return JsonConvert.SerializeObject(request, Options.JsonSerializerSettings);
31+
public string SerializeToString(GraphQL.GraphQLRequest request) {
32+
return JsonConvert.SerializeObject(new GraphQLRequest(request), Options.JsonSerializerSettings);
3333
}
3434

35-
public byte[] SerializeToBytes(GraphQLWebSocketRequest request) {
35+
public byte[] SerializeToBytes(Abstractions.Websocket.GraphQLWebSocketRequest request) {
3636
var json = JsonConvert.SerializeObject(request, Options.JsonSerializerSettings);
3737
return Encoding.UTF8.GetBytes(json);
3838
}

‎src/GraphQL.Client.Serializer.Newtonsoft/NewtonsoftJsonSerializerOptions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace GraphQL.Client.Serializer.Newtonsoft {
55
public class NewtonsoftJsonSerializerOptions {
66
public JsonSerializerSettings JsonSerializerSettings { get; set; } = new JsonSerializerSettings {
7-
ContractResolver = new CamelCasePropertyNamesContractResolver()
7+
ContractResolver = new CamelCasePropertyNamesContractResolver { IgnoreIsSpecifiedMembers = true }
88
};
99
}
1010
}

‎src/GraphQL.Client.Serializer.SystemTextJson/STJGraphQLRequest.cs‎ renamed to ‎src/GraphQL.Client.Serializer.SystemTextJson/GraphQLRequest.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
using System.Text.Json.Serialization;
2-
using Dahomey.Json.Attributes;
32

43
namespace GraphQL.Client.Serializer.SystemTextJson {
5-
public class STJGraphQLRequest: GraphQLRequest {
4+
public class GraphQLRequest: GraphQL.GraphQLRequest {
65
[JsonPropertyName(QueryKey)]
76
public override string Query { get; set; }
87
[JsonPropertyName(OperationNameKey)]
98
public override string? OperationName { get; set; }
109
[JsonPropertyName(VariablesKey)]
1110
public override object? Variables { get; set; }
1211

13-
public STJGraphQLRequest() { }
12+
public GraphQLRequest() { }
1413

15-
public STJGraphQLRequest(GraphQLRequest other) {
14+
public GraphQLRequest(GraphQL.GraphQLRequest other) {
1615
Query = other.Query;
1716
OperationName = other.OperationName;
1817
Variables = other.Variables;

‎src/GraphQL.Client.Serializer.SystemTextJson/STJGraphQLWebSocketRequest.cs‎ renamed to ‎src/GraphQL.Client.Serializer.SystemTextJson/GraphQLWebSocketRequest.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
using System.Text.Json.Serialization;
2-
using GraphQL.Client.Abstractions.Websocket;
32

43
namespace GraphQL.Client.Serializer.SystemTextJson {
5-
public class STJGraphQLWebSocketRequest: GraphQLWebSocketRequest {
4+
public class GraphQLWebSocketRequest: Abstractions.Websocket.GraphQLWebSocketRequest {
65

76
[JsonPropertyName(IdKey)]
87
public override string Id { get; set; }
98
[JsonPropertyName(TypeKey)]
109
public override string Type { get; set; }
1110
[JsonPropertyName(PayloadKey)]
12-
public override GraphQLRequest Payload { get; set; }
11+
public override GraphQL.GraphQLRequest Payload { get; set; }
1312

14-
public STJGraphQLWebSocketRequest()
13+
public GraphQLWebSocketRequest()
1514
{
1615
}
1716

18-
public STJGraphQLWebSocketRequest(GraphQLWebSocketRequest other) {
17+
public GraphQLWebSocketRequest(Abstractions.Websocket.GraphQLWebSocketRequest other) {
1918
Id = other.Id;
2019
Type = other.Type;
21-
Payload = new STJGraphQLRequest(other.Payload);
20+
Payload = new GraphQLRequest(other.Payload);
2221
}
2322
}
2423
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ private void ConfigureMandatorySerializerOptions() {
2828
Options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
2929
}
3030

31-
public string SerializeToString(GraphQLRequest request) {
32-
return JsonSerializer.Serialize(new STJGraphQLRequest(request), Options.JsonSerializerOptions);
31+
public string SerializeToString(GraphQL.GraphQLRequest request) {
32+
return JsonSerializer.Serialize(new GraphQLRequest(request), Options.JsonSerializerOptions);
3333
}
3434

3535
public Task<GraphQLResponse<TResponse>> DeserializeFromUtf8StreamAsync<TResponse>(Stream stream, CancellationToken cancellationToken) {
3636
return JsonSerializer.DeserializeAsync<GraphQLResponse<TResponse>>(stream, Options.JsonSerializerOptions, cancellationToken).AsTask();
3737
}
3838

39-
public byte[] SerializeToBytes(GraphQLWebSocketRequest request) {
40-
return JsonSerializer.SerializeToUtf8Bytes(new STJGraphQLWebSocketRequest(request), Options.JsonSerializerOptions);
39+
public byte[] SerializeToBytes(Abstractions.Websocket.GraphQLWebSocketRequest request) {
40+
return JsonSerializer.SerializeToUtf8Bytes(new GraphQLWebSocketRequest(request), Options.JsonSerializerOptions);
4141
}
4242

4343
public Task<WebsocketResponseWrapper> DeserializeToWebsocketResponseWrapperAsync(Stream stream) {

‎tests/GraphQL.Client.Serializer.Tests/BaseSerializeNoCamelCaseTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected BaseSerializeNoCamelCaseTest(IGraphQLWebsocketJsonSerializer serialize
2828
[ClassData(typeof(SerializeToStringTestData))]
2929
public void SerializeToStringTest(string expectedJson, GraphQLRequest request) {
3030
var json = Serializer.SerializeToString(request).RemoveWhitespace();
31-
json.Should().BeEquivalentTo(expectedJson.RemoveWhitespace());
31+
json.Should().Be(expectedJson.RemoveWhitespace());
3232
}
3333

3434
[Fact]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ public IEnumerator<object[]> GetEnumerator() {
1010
new GraphQLRequest("simple query string")
1111
};
1212
yield return new object[] {
13-
"{\"query\":\"simplequerystring\",\"operationName\":null,\"variables\":{\"camelCaseProperty\":\"test\",\"pascalCaseProperty\":\"test\"}}",
14-
new GraphQLRequest("simple query string", new { camelCaseProperty = "test", PascalCaseProperty = "test"})
13+
"{\"query\":\"simplequerystring\",\"operationName\":null,\"variables\":{\"camelCaseProperty\":\"camelCase\",\"PascalCaseProperty\":\"PascalCase\"}}",
14+
new GraphQLRequest("simple query string", new { camelCaseProperty = "camelCase", PascalCaseProperty = "PascalCase"})
1515
};
1616
}
1717

0 commit comments

Comments
 (0)