Merge pull request #281 from graphql-dotnet/add-enum-json-converter

add constant case enum converters for both serializers

Author: rose-a

src/GraphQL.Client.LocalExecution/GraphQL.Client.LocalExecution.csproj

@@ -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>

src/GraphQL.Client.LocalExecution/GraphQLLocalExecutionClient.cs

@@ -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;
@@ -31,7 +32,7 @@ public class GraphQLLocalExecutionClient<TSchema> : IGraphQLClient where TSchema
             ContractResolver = new CamelCasePropertyNamesContractResolver(),
             Converters = new List<JsonConverter>
             {
-                new GraphQLEnumConverter()
+                new ConstantCaseEnumConverter()
             }
         };
 
@@ -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)
@@ -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)));

src/GraphQL.Client.LocalExecution/GraphQLEnumConverter.cs renamed to src/GraphQL.Client.Serializer.Newtonsoft/ConstantCaseEnumConverter.cs

@@ -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)
         {
@@ -29,7 +29,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
                 }
                 else
                 {
-                    writer.WriteValue(StringUtils.ToConstantCase(memberName));
+                    writer.WriteValue(memberName.ToConstantCase());
                 }
             }
         }

src/GraphQL.Client.Serializer.Newtonsoft/GraphQL.Client.Serializer.Newtonsoft.csproj

@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Panic.StringUtils" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -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; }

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

@@ -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();
+    }
+}

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

@@ -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>

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

@@ -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;
@@ -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; }

tests/GraphQL.Client.Serializer.Tests/NewtonsoftSerializerTest.cs

@@ -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() } })) { }
     }
 }

tests/GraphQL.Client.Serializer.Tests/SystemTextJsonSerializerTests.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using GraphQL.Client.Serializer.SystemTextJson;
 
 namespace GraphQL.Client.Serializer.Tests
@@ -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())) { }
     }
 }