Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

<ItemGroup>
<ProjectReference Include="..\GraphQL.Client.Abstractions\GraphQL.Client.Abstractions.csproj" />
<ProjectReference Include="..\GraphQL.Client.Serializer.Newtonsoft\GraphQL.Client.Serializer.Newtonsoft.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Threading;
using System.Threading.Tasks;
using GraphQL.Client.Abstractions;
using GraphQL.Client.Serializer.Newtonsoft;
using GraphQL.Subscription;
using GraphQL.Types;
using Newtonsoft.Json;
Expand All @@ -31,7 +32,7 @@ public class GraphQLLocalExecutionClient<TSchema> : IGraphQLClient where TSchema
ContractResolver = new CamelCasePropertyNamesContractResolver(),
Converters = new List<JsonConverter>
{
new GraphQLEnumConverter()
new ConstantCaseEnumConverter()
}
};

Expand All @@ -50,7 +51,7 @@ public GraphQLLocalExecutionClient(TSchema schema, IGraphQLJsonSerializer serial
Schema.Initialize();
_documentExecuter = new DocumentExecuter();
}

public void Dispose() { }

public Task<GraphQLResponse<TResponse>> SendQueryAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken = default)
Expand Down Expand Up @@ -80,7 +81,7 @@ private async Task<IObservable<GraphQLResponse<TResponse>>> ExecuteSubscriptionA
{
var result = await ExecuteAsync(request, cancellationToken);
var stream = ((SubscriptionExecutionResult)result).Streams?.Values.SingleOrDefault();

return stream == null
? Observable.Throw<GraphQLResponse<TResponse>>(new InvalidOperationException("the GraphQL execution did not return an observable"))
: stream.SelectMany(executionResult => Observable.FromAsync(token => ExecutionResultToGraphQLResponse<TResponse>(executionResult, token)));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using System;
using System.Linq;
using System.Reflection;
using GraphQL.Utilities;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Panic.StringUtils.Extensions;

namespace GraphQL.Client.LocalExecution
namespace GraphQL.Client.Serializer.Newtonsoft
{
public class GraphQLEnumConverter : StringEnumConverter
public class ConstantCaseEnumConverter : StringEnumConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
Expand All @@ -29,7 +29,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
}
else
{
writer.WriteValue(StringUtils.ToConstantCase(memberName));
writer.WriteValue(memberName.ToConstantCase());
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Panic.StringUtils" Version="1.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ public class NewtonsoftJsonSerializer : IGraphQLWebsocketJsonSerializer
public static JsonSerializerSettings DefaultJsonSerializerSettings => new JsonSerializerSettings
{
ContractResolver = new CamelCasePropertyNamesContractResolver { IgnoreIsSpecifiedMembers = true },
MissingMemberHandling = MissingMemberHandling.Ignore
MissingMemberHandling = MissingMemberHandling.Ignore,
Converters = { new ConstantCaseEnumConverter() }
};

public JsonSerializerSettings JsonSerializerSettings { get; }
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using System.Text.Json;
using Panic.StringUtils.Extensions;

namespace GraphQL.Client.Serializer.SystemTextJson
{
public class ConstantCaseJsonNamingPolicy: JsonNamingPolicy
{
public override string ConvertName(string name) => name.ToConstantCase();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@
<ProjectReference Include="..\GraphQL.Client.Abstractions.Websocket\GraphQL.Client.Abstractions.Websocket.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Panic.StringUtils" Version="1.0.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.IO;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
using GraphQL.Client.Abstractions;
Expand All @@ -12,7 +13,8 @@ public class SystemTextJsonSerializer : IGraphQLWebsocketJsonSerializer
{
public static JsonSerializerOptions DefaultJsonSerializerOptions => new JsonSerializerOptions
{
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
Converters = { new JsonStringEnumConverter(new ConstantCaseJsonNamingPolicy(), false)}
}.SetupImmutableConverter();

public JsonSerializerOptions Options { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ public NewtonsoftSerializerTest() : base(new NewtonsoftJsonSerializer()) { }
public class NewtonsoftSerializeNoCamelCaseTest : BaseSerializeNoCamelCaseTest
{
public NewtonsoftSerializeNoCamelCaseTest()
: base(new NewtonsoftJsonSerializer(new JsonSerializerSettings())) { }
: base(new NewtonsoftJsonSerializer(new JsonSerializerSettings(){ Converters = { new ConstantCaseEnumConverter() } })) { }
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Text.Json;
using System.Text.Json.Serialization;
using GraphQL.Client.Serializer.SystemTextJson;

namespace GraphQL.Client.Serializer.Tests
Expand All @@ -11,6 +12,6 @@ public SystemTextJsonSerializerTests() : base(new SystemTextJsonSerializer()) {
public class SystemTextJsonSerializeNoCamelCaseTest : BaseSerializeNoCamelCaseTest
{
public SystemTextJsonSerializeNoCamelCaseTest()
: base(new SystemTextJsonSerializer(new JsonSerializerOptions().SetupImmutableConverter())) { }
: base(new SystemTextJsonSerializer(new JsonSerializerOptions(){Converters = { new JsonStringEnumConverter(new ConstantCaseJsonNamingPolicy(), false)}}.SetupImmutableConverter())) { }
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

namespace GraphQL.Client.Serializer.Tests.TestData
{
Expand All @@ -19,8 +21,22 @@ public IEnumerator<object[]> GetEnumerator()
"{\"query\":\"simplequerystring\",\"variables\":null,\"operationName\":null,\"authentication\":\"an-authentication-token\"}",
new GraphQLRequest("simple query string"){{"authentication", "an-authentication-token"}}
};
yield return new object[] {
"{\"query\":\"enumtest\",\"variables\":{\"enums\":[\"REGULAR\",\"PASCAL_CASE\",\"CAMEL_CASE\",\"LOWER\",\"UPPER\",\"CONSTANT_CASE\"]},\"operationName\":null}",
new GraphQLRequest("enumtest", new { enums = Enum.GetValues(typeof(TestEnum)).Cast<TestEnum>()})
};
}

IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();

public enum TestEnum
{
Regular,
PascalCase,
camelCase,
lower,
UPPER,
CONSTANT_CASE
}
}
}