remove Options classes from serializers, fix GraphQLWebsocketRequest transformation

rose-a · rose-a · commit a6f192b7fdb4 · 2020-02-12T15:18:45.000+01:00
diff --git a/src/GraphQL.Client.Abstractions/GraphQLJsonSerializerExtensions.cs b/src/GraphQL.Client.Abstractions/GraphQLJsonSerializerExtensions.cs
@@ -22,8 +22,10 @@ public static TSerializerInterface EnsureAssigned<TSerializerInterface>(this TSe
 			return jsonSerializer;
 		}
 
-		public static TOptions New<TOptions>(this Action<TOptions> configure) {
-			var options = Activator.CreateInstance<TOptions>();
+		public static TOptions New<TOptions>(this Action<TOptions> configure) =>
+			configure.AndReturn(Activator.CreateInstance<TOptions>());
+
+		public static TOptions AndReturn<TOptions>(this Action<TOptions> configure, TOptions options) {
 			configure(options);
 			return options;
 		}
diff --git a/src/GraphQL.Client.Serializer.Newtonsoft/GraphQLWebSocketRequest.cs b/src/GraphQL.Client.Serializer.Newtonsoft/GraphQLWebSocketRequest.cs
@@ -17,7 +17,7 @@ public GraphQLWebSocketRequest()
 		public GraphQLWebSocketRequest(Abstractions.Websocket.GraphQLWebSocketRequest other) {
 			Id = other.Id;
 			Type = other.Type;
-			Payload = new GraphQLRequest(other.Payload); // create serializer-specific type
+			Payload = other.Payload != null ? new GraphQLRequest(other.Payload) : null; // create serializer-specific type
 		}
 	}
 }
diff --git a/src/GraphQL.Client.Serializer.Newtonsoft/NewtonsoftJsonSerializer.cs b/src/GraphQL.Client.Serializer.Newtonsoft/NewtonsoftJsonSerializer.cs
@@ -1,39 +1,44 @@
 using System;
 using System.IO;
-using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using GraphQL.Client.Abstractions;
 using GraphQL.Client.Abstractions.Websocket;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 
 namespace GraphQL.Client.Serializer.Newtonsoft
 {
     public class NewtonsoftJsonSerializer: IGraphQLWebsocketJsonSerializer
     {
-	    public NewtonsoftJsonSerializerOptions Options { get; }
+		public static JsonSerializerSettings DefaultJsonSerializerSettings => new JsonSerializerSettings {
+			ContractResolver = new CamelCasePropertyNamesContractResolver { IgnoreIsSpecifiedMembers = true },
+			MissingMemberHandling = MissingMemberHandling.Ignore
+		};
 
-	    public NewtonsoftJsonSerializer() : this(new NewtonsoftJsonSerializerOptions()) { }
+		public JsonSerializerSettings JsonSerializerSettings { get; }
 
-		public NewtonsoftJsonSerializer(Action<NewtonsoftJsonSerializerOptions> configure) : this(configure.New()) { }
+	    public NewtonsoftJsonSerializer() : this(DefaultJsonSerializerSettings) { }
 
-		public NewtonsoftJsonSerializer(NewtonsoftJsonSerializerOptions options) {
-		    Options = options;
+		public NewtonsoftJsonSerializer(Action<JsonSerializerSettings> configure) : this(configure.AndReturn(DefaultJsonSerializerSettings)) { }
+
+		public NewtonsoftJsonSerializer(JsonSerializerSettings jsonSerializerSettings) {
+		    JsonSerializerSettings = jsonSerializerSettings;
 		    ConfigureMandatorySerializerOptions();
 		}
 
 		private void ConfigureMandatorySerializerOptions() {
 			// deserialize extensions to Dictionary<string, object>
-			Options.JsonSerializerSettings.Converters.Insert(0, new GraphQLExtensionsConverter());
+			JsonSerializerSettings.Converters.Insert(0, new GraphQLExtensionsConverter());
 		}
 
 		public string SerializeToString(GraphQL.GraphQLRequest request) {
-		    return JsonConvert.SerializeObject(new GraphQLRequest(request), Options.JsonSerializerSettings);
+		    return JsonConvert.SerializeObject(new GraphQLRequest(request), JsonSerializerSettings);
 		}
 
 		public byte[] SerializeToBytes(Abstractions.Websocket.GraphQLWebSocketRequest request) {
-			var json = JsonConvert.SerializeObject(new GraphQLWebSocketRequest(request), Options.JsonSerializerSettings);
+			var json = JsonConvert.SerializeObject(new GraphQLWebSocketRequest(request), JsonSerializerSettings);
 			return Encoding.UTF8.GetBytes(json);
 		}
 
@@ -43,7 +48,7 @@ public Task<WebsocketResponseWrapper> DeserializeToWebsocketResponseWrapperAsync
 
 		public GraphQLWebSocketResponse<GraphQLResponse<TResponse>> DeserializeToWebsocketResponse<TResponse>(byte[] bytes) {
 			return JsonConvert.DeserializeObject<GraphQLWebSocketResponse<GraphQLResponse<TResponse>>>(Encoding.UTF8.GetString(bytes),
-				Options.JsonSerializerSettings);
+				JsonSerializerSettings);
 		}
 
 		public Task<GraphQLResponse<TResponse>> DeserializeFromUtf8StreamAsync<TResponse>(Stream stream, CancellationToken cancellationToken) {
@@ -54,7 +59,7 @@ public Task<GraphQLResponse<TResponse>> DeserializeFromUtf8StreamAsync<TResponse
 		private Task<T> DeserializeFromUtf8Stream<T>(Stream stream) {
 			using StreamReader sr = new StreamReader(stream);
 			using JsonReader reader = new JsonTextReader(sr);
-			JsonSerializer serializer = JsonSerializer.Create(Options.JsonSerializerSettings);
+			JsonSerializer serializer = JsonSerializer.Create(JsonSerializerSettings);
 			return Task.FromResult(serializer.Deserialize<T>(reader));
 		}
 
diff --git a/src/GraphQL.Client.Serializer.Newtonsoft/NewtonsoftJsonSerializerOptions.cs b/src/GraphQL.Client.Serializer.Newtonsoft/NewtonsoftJsonSerializerOptions.cs
diff --git a/src/GraphQL.Client.Serializer.SystemTextJson/GraphQLWebSocketRequest.cs b/src/GraphQL.Client.Serializer.SystemTextJson/GraphQLWebSocketRequest.cs
@@ -17,7 +17,7 @@ public GraphQLWebSocketRequest()
 		public GraphQLWebSocketRequest(Abstractions.Websocket.GraphQLWebSocketRequest other) {
 			Id = other.Id;
 			Type = other.Type;
-			Payload = new GraphQLRequest(other.Payload);
+			Payload = other.Payload != null ? new GraphQLRequest(other.Payload) : null; // create serializer-specific type;
 		}
 	}
 }
diff --git a/src/GraphQL.Client.Serializer.SystemTextJson/SystemTextJsonSerializer.cs b/src/GraphQL.Client.Serializer.SystemTextJson/SystemTextJsonSerializer.cs
@@ -3,50 +3,55 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Dahomey.Json;
 using GraphQL.Client.Abstractions;
 using GraphQL.Client.Abstractions.Websocket;
 
 namespace GraphQL.Client.Serializer.SystemTextJson
 {
     public class SystemTextJsonSerializer: IGraphQLWebsocketJsonSerializer
     {
-	    public SystemTextJsonSerializerOptions Options { get; }
+	    public static JsonSerializerOptions DefaultJsonSerializerOptions => new JsonSerializerOptions {
+		    PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+	    }.SetupExtensions();
 
-	    public SystemTextJsonSerializer() : this(new SystemTextJsonSerializerOptions()) { }
+		public JsonSerializerOptions Options { get; }
 
-	    public SystemTextJsonSerializer(Action<SystemTextJsonSerializerOptions> configure) : this(configure.New()) { }
+	    public SystemTextJsonSerializer() : this(DefaultJsonSerializerOptions) { }
 
-		public SystemTextJsonSerializer(SystemTextJsonSerializerOptions options) {
+	    public SystemTextJsonSerializer(Action<JsonSerializerOptions> configure) : this(configure.AndReturn(DefaultJsonSerializerOptions)) { }
+
+		public SystemTextJsonSerializer(JsonSerializerOptions options) {
 		    Options = options;
 		    ConfigureMandatorySerializerOptions();
 		}
 
 		private void ConfigureMandatorySerializerOptions() {
 			// deserialize extensions to Dictionary<string, object>
-			Options.JsonSerializerOptions.Converters.Insert(0, new GraphQLExtensionsConverter());
+			Options.Converters.Insert(0, new GraphQLExtensionsConverter());
 			// allow the JSON field "data" to match the property "Data" even without JsonNamingPolicy.CamelCase
-			Options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
+			Options.PropertyNameCaseInsensitive = true;
 		}
 
 	    public string SerializeToString(GraphQL.GraphQLRequest request) {
-		    return JsonSerializer.Serialize(new GraphQLRequest(request), Options.JsonSerializerOptions);
+		    return JsonSerializer.Serialize(new GraphQLRequest(request), Options);
 	    }
 
 	    public Task<GraphQLResponse<TResponse>> DeserializeFromUtf8StreamAsync<TResponse>(Stream stream, CancellationToken cancellationToken) {
-		    return JsonSerializer.DeserializeAsync<GraphQLResponse<TResponse>>(stream, Options.JsonSerializerOptions, cancellationToken).AsTask();
+		    return JsonSerializer.DeserializeAsync<GraphQLResponse<TResponse>>(stream, Options, cancellationToken).AsTask();
 	    }
 
 	    public byte[] SerializeToBytes(Abstractions.Websocket.GraphQLWebSocketRequest request) {
-		    return JsonSerializer.SerializeToUtf8Bytes(new GraphQLWebSocketRequest(request), Options.JsonSerializerOptions);
+		    return JsonSerializer.SerializeToUtf8Bytes(new GraphQLWebSocketRequest(request), Options);
 	    }
 
 	    public Task<WebsocketResponseWrapper> DeserializeToWebsocketResponseWrapperAsync(Stream stream) {
-		    return JsonSerializer.DeserializeAsync<WebsocketResponseWrapper>(stream, Options.JsonSerializerOptions).AsTask();
+		    return JsonSerializer.DeserializeAsync<WebsocketResponseWrapper>(stream, Options).AsTask();
 		}
 
 	    public GraphQLWebSocketResponse<GraphQLResponse<TResponse>> DeserializeToWebsocketResponse<TResponse>(byte[] bytes) {
 		    return JsonSerializer.Deserialize<GraphQLWebSocketResponse<GraphQLResponse<TResponse>>>(new ReadOnlySpan<byte>(bytes),
-			    Options.JsonSerializerOptions);
+			    Options);
 	    }
 
     }
diff --git a/src/GraphQL.Client.Serializer.SystemTextJson/SystemTextJsonSerializerOptions.cs b/src/GraphQL.Client.Serializer.SystemTextJson/SystemTextJsonSerializerOptions.cs
diff --git a/tests/GraphQL.Client.Serializer.Tests/NewtonsoftSerializerTest.cs b/tests/GraphQL.Client.Serializer.Tests/NewtonsoftSerializerTest.cs
@@ -8,6 +8,6 @@ public NewtonsoftSerializerTest() : base(new NewtonsoftJsonSerializer()) { }
 
 	public class NewtonsoftSerializeNoCamelCaseTest : BaseSerializeNoCamelCaseTest {
 		public NewtonsoftSerializeNoCamelCaseTest()
-			: base(new NewtonsoftJsonSerializer(options => options.JsonSerializerSettings = new JsonSerializerSettings())) { }
+			: base(new NewtonsoftJsonSerializer(new JsonSerializerSettings())) { }
 	}
 }
diff --git a/tests/GraphQL.Client.Serializer.Tests/SystemTextJsonSerializerTests.cs b/tests/GraphQL.Client.Serializer.Tests/SystemTextJsonSerializerTests.cs
@@ -9,6 +9,6 @@ public SystemTextJsonSerializerTests() : base(new SystemTextJsonSerializer()) {
 
 	public class SystemTextJsonSerializeNoCamelCaseTest : BaseSerializeNoCamelCaseTest {
 		public SystemTextJsonSerializeNoCamelCaseTest()
-			: base(new SystemTextJsonSerializer(options => options.JsonSerializerOptions = new JsonSerializerOptions().SetupExtensions())) { }
+			: base(new SystemTextJsonSerializer(new JsonSerializerOptions().SetupExtensions())) { }
 	}
 }
diff --git a/tests/GraphQL.Client.Tests.Common/GraphQL.Client.Tests.Common.csproj b/tests/GraphQL.Client.Tests.Common/GraphQL.Client.Tests.Common.csproj
@@ -5,13 +5,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="5.10.0" />
     <PackageReference Include="GraphQL" Version="2.4.0" />
     <PackageReference Include="GraphQL.Server.Transports.Subscriptions.Abstractions" Version="3.4.0" />
     <PackageReference Include="GraphQL.StarWars" Version="1.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
     <PackageReference Include="System.Reactive" Version="4.3.2" />
     <PackageReference Include="System.Reactive.Compatibility" Version="4.3.2" />
-    <PackageReference Include="xunit" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/GraphQL.Client.Tests.Common/Helpers/CallbackTester.cs b/tests/GraphQL.Client.Tests.Common/Helpers/CallbackTester.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading;
-using Xunit;
+using FluentAssertions;
 
 namespace GraphQL.Client.Tests.Common.Helpers {
 	public class CallbackTester<T> {
@@ -32,8 +32,8 @@ public void Callback(T param) {
 		/// <param name="assertPayload">action to assert the contents of the payload</param>
 		public void CallbackShouldHaveBeenInvoked(Action<T> assertPayload = null, TimeSpan? timeout = null) {
 			try {
-				if (!_callbackInvoked.Wait(timeout ?? Timeout))
-					Assert.True(false, $"callback not invoked within {(timeout ?? Timeout).TotalSeconds} s!");
+				_callbackInvoked.Wait(timeout ?? Timeout).Should().BeTrue("because the callback method should have been invoked (timeout: {0} s)",
+					(timeout ?? Timeout).TotalSeconds);
 
 				assertPayload?.Invoke(LastPayload);
 			}
@@ -49,8 +49,7 @@ public void CallbackShouldHaveBeenInvoked(Action<T> assertPayload = null, TimeSp
 		public void CallbackShouldNotHaveBeenInvoked(TimeSpan? timeout = null) {
 			if (!timeout.HasValue) timeout = TimeSpan.FromMilliseconds(100);
 			try {
-				if (_callbackInvoked.Wait(timeout.Value))
-					Assert.True(false, "callback was inadvertently invoked pushed!");
+				_callbackInvoked.Wait(timeout.Value).Should().BeFalse("because the callback method should not have been invoked");
 			}
 			finally {
 				Reset();
diff --git a/tests/GraphQL.Client.Tests.Common/Helpers/ObservableTester.cs b/tests/GraphQL.Client.Tests.Common/Helpers/ObservableTester.cs
diff --git a/tests/GraphQL.Integration.Tests/WebsocketTest.cs b/tests/GraphQL.Integration.Tests/WebsocketTest.cs

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,10 @@ public static TSerializerInterface EnsureAssigned<TSerializerInterface>(this TSe`
`22`	`22`	`return jsonSerializer;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public static TOptions New<TOptions>(this Action<TOptions> configure) {`
`26`		`- var options = Activator.CreateInstance<TOptions>();`
	`25`	`+ public static TOptions New<TOptions>(this Action<TOptions> configure) =>`
	`26`	`+ configure.AndReturn(Activator.CreateInstance<TOptions>());`
	`27`	`+`
	`28`	`+ public static TOptions AndReturn<TOptions>(this Action<TOptions> configure, TOptions options) {`
`27`	`29`	`configure(options);`
`28`	`30`	`return options;`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public GraphQLWebSocketRequest()`
`17`	`17`	`public GraphQLWebSocketRequest(Abstractions.Websocket.GraphQLWebSocketRequest other) {`
`18`	`18`	`Id = other.Id;`
`19`	`19`	`Type = other.Type;`
`20`		`- Payload = new GraphQLRequest(other.Payload); // create serializer-specific type`
	`20`	`+ Payload = other.Payload != null ? new GraphQLRequest(other.Payload) : null; // create serializer-specific type`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ public NewtonsoftSerializerTest() : base(new NewtonsoftJsonSerializer()) { }`
`8`	`8`
`9`	`9`	`public class NewtonsoftSerializeNoCamelCaseTest : BaseSerializeNoCamelCaseTest {`
`10`	`10`	`public NewtonsoftSerializeNoCamelCaseTest()`
`11`		`- : base(new NewtonsoftJsonSerializer(options => options.JsonSerializerSettings = new JsonSerializerSettings())) { }`
	`11`	`+ : base(new NewtonsoftJsonSerializer(new JsonSerializerSettings())) { }`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ public SystemTextJsonSerializerTests() : base(new SystemTextJsonSerializer()) {`
`9`	`9`
`10`	`10`	`public class SystemTextJsonSerializeNoCamelCaseTest : BaseSerializeNoCamelCaseTest {`
`11`	`11`	`public SystemTextJsonSerializeNoCamelCaseTest()`
`12`		`- : base(new SystemTextJsonSerializer(options => options.JsonSerializerOptions = new JsonSerializerOptions().SetupExtensions())) { }`
	`12`	`+ : base(new SystemTextJsonSerializer(new JsonSerializerOptions().SetupExtensions())) { }`
`13`	`13`	`}`
`14`	`14`	`}`