Improved async interface.

Author: Oren (electricessence)

Open.Serialization.Json.System/JsonSerializerFactory.cs

@@ -12,21 +12,19 @@ public JsonSerializerFactory(JsonSerializerOptions defaultOptions = null)
 			_options = defaultOptions?.Clone() ?? DefaultOptions;
 		}
 
-		JsonSerializerInternal _default;
 		JsonSerializerInternal _caseSensitive;
 		JsonSerializerInternal _ignoreCase;
 
-		protected override SerializerBase GetDeserializerInternal(bool caseSensitive)
-			=> caseSensitive
-				? LazyInitializer.EnsureInitialized(ref _caseSensitive,
-					() => new JsonSerializerInternal(_options.Clone().SetPropertyNameCaseInsensitive(false)))
-				: LazyInitializer.EnsureInitialized(ref _ignoreCase,
-					() => new JsonSerializerInternal(_options.Clone().SetPropertyNameCaseInsensitive(true)));
-		
-		protected override SerializerBase GetSerializerInternal(IJsonSerializationOptions options)
+		public override IJsonSerializer GetSerializer(IJsonSerializationOptions options = null, bool caseSensitive = false)
 		{
 			if (options == null)
-				return LazyInitializer.EnsureInitialized(ref _default, () => new JsonSerializerInternal(_options));
+			{
+				return caseSensitive
+					? LazyInitializer.EnsureInitialized(ref _caseSensitive,
+						() => new JsonSerializerInternal(_options.Clone().SetPropertyNameCaseInsensitive(false)))
+					: LazyInitializer.EnsureInitialized(ref _ignoreCase,
+						() => new JsonSerializerInternal(_options.Clone().SetPropertyNameCaseInsensitive(true)));
+			}
 
 			var o = _options.Clone();
 			o.IgnoreNullValues = options.OmitNull;

Open.Serialization.Json.System/JsonSerializerInternal.cs

@@ -1,8 +1,10 @@
-using System.Text.Json;
+using System.IO;
+using System.Text.Json;
+using System.Threading.Tasks;
 
 namespace Open.Serialization.Json.System
 {
-	internal class JsonSerializerInternal : SerializerBase, IJsonSerializer
+	internal class JsonSerializerInternal : JsonSerializerBase
 	{
 		readonly JsonSerializerOptions _options;
 		internal JsonSerializerInternal(JsonSerializerOptions options)
@@ -15,6 +17,9 @@ public override T Deserialize<T>(string value)
 
 		public override string Serialize<T>(T item)
 			=> JsonSerializer.Serialize(item, _options);
+
+		public override ValueTask<T> DeserializeAsync<T>(Stream stream)
+			=> JsonSerializer.DeserializeAsync<T>(stream, _options);
 	}
 
 	internal class JsonSerializerInternal<T> : Serializer<T>, IJsonSerializer<T>

Open.Serialization.Json.System/Open.Serialization.Json.System.csproj

@@ -21,7 +21,7 @@ Part of the "Open" set of libraries.
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Open.Serialization.Json" Version="1.0.1" />
+    <PackageReference Include="Open.Serialization.Json" Version="1.1.2" />
     <PackageReference Include="System.Text.Json" Version="4.6.0" />
   </ItemGroup>
 

Open.Serialization/IDeserializeAsync.cs

@@ -1,15 +1,16 @@
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Open.Serialization
 {
 	public interface IDeserializeAsync
 	{
-		ValueTask<T> DeserializeAsync<T>(Stream stream);
+		ValueTask<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default);
 	}
 
 	public interface IDeserializeAsync<T>
 	{
-		ValueTask<T> DeserializeAsync(Stream stream);
+		ValueTask<T> DeserializeAsync(Stream stream, CancellationToken cancellationToken = default);
 	}
 }

Open.Serialization/ISerializeAsync.cs

@@ -1,15 +1,16 @@
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Open.Serialization
 {
 	public interface ISerializeAsync
 	{
-		ValueTask SerializeAsync<T>(Stream stream, T item);
+		ValueTask SerializeAsync<T>(Stream stream, T item, CancellationToken cancellationToken = default);
 	}
 
 	public interface ISerializeAsync<T>
 	{
-		ValueTask SerializeAsync(Stream stream, T item);
+		ValueTask SerializeAsync(Stream stream, T item, CancellationToken cancellationToken = default);
 	}
 }

Open.Serialization/Open.Serialization.csproj

@@ -15,11 +15,12 @@ Part of the "Open" set of libraries.</Description>
 		<RepositoryUrl>https://github.com/electricessence/Open.Serialization</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 		<PackageTags>serialization json</PackageTags>
-		<Version>1.1.2</Version>
+		<Version>1.2.0</Version>
 	</PropertyGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
 		<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
+		<!--<PackageReference Include="System.Memory" Version="4.5.3" />-->
 	</ItemGroup>
 
 </Project>

Open.Serialization/Serializer.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Open.Serialization
@@ -8,14 +9,14 @@ public class Serializer<T> : SerializerBase<T>
 	{
 		private readonly Func<string, T> _deserializer;
 		private readonly Func<T, string> _serializer;
-		private readonly Func<Stream, ValueTask<T>> _deserializerAsync;
-		private readonly Func<Stream, T, ValueTask> _serializerAsync;
+		private readonly Func<Stream, CancellationToken, ValueTask<T>> _deserializerAsync;
+		private readonly Func<Stream, T, CancellationToken, ValueTask> _serializerAsync;
 
 		public Serializer(
 			Func<string, T> deserializer,
 			Func<T, string> serializer = null,
-			Func<Stream, ValueTask<T>> deserializerAsync = null,
-			Func<Stream, T, ValueTask> serializerAsync = null)
+			Func<Stream, CancellationToken, ValueTask<T>> deserializerAsync = null,
+			Func<Stream, T, CancellationToken, ValueTask> serializerAsync = null)
 		{
 			// It's supported to instantiate a deserializer without a serializer.
 			_deserializer = deserializer ?? throw new ArgumentNullException(nameof(deserializer));
@@ -25,10 +26,10 @@ public Serializer(
 		}
 
 		public override T Deserialize(string value) => _deserializer(value);
-		public override ValueTask<T> DeserializeAsync(Stream stream) => _deserializerAsync(stream);
+		public override ValueTask<T> DeserializeAsync(Stream stream, CancellationToken cancellationToken = default) => _deserializerAsync(stream, cancellationToken);
 
 		public override string Serialize(T item) => _serializer(item);
-		public override ValueTask SerializeAsync(Stream stream, T item) => _serializerAsync(stream, item);
+		public override ValueTask SerializeAsync(Stream stream, T item, CancellationToken cancellationToken = default) => _serializerAsync(stream, item, cancellationToken);
 
 	}
 }

Open.Serialization/SerializerBase.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Open.Serialization
@@ -7,7 +8,7 @@ public abstract class SerializerBase : ISerializer, IAsyncSerializer
 	{
 		public abstract T Deserialize<T>(string value);
 
-		public virtual async ValueTask<T> DeserializeAsync<T>(Stream stream)
+		public virtual async ValueTask<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default)
 		{
 			string text;
 			using(var reader = new StreamReader(stream))
@@ -17,7 +18,7 @@ public virtual async ValueTask<T> DeserializeAsync<T>(Stream stream)
 
 		public abstract string Serialize<T>(T item);
 
-		public virtual async ValueTask SerializeAsync<T>(Stream stream, T item)
+		public virtual async ValueTask SerializeAsync<T>(Stream stream, T item, CancellationToken cancellationToken = default)
 		{
 			var text = Serialize(item);
 			using var writer = new StreamWriter(stream);
@@ -32,7 +33,7 @@ public abstract class SerializerBase<T> : ISerializer<T>, IAsyncSerializer<T>
 	{
 		public abstract T Deserialize(string value);
 
-		public virtual async ValueTask<T> DeserializeAsync(Stream stream)
+		public virtual async ValueTask<T> DeserializeAsync(Stream stream, CancellationToken cancellationToken = default)
 		{
 			string text;
 			using (var reader = new StreamReader(stream))
@@ -42,7 +43,7 @@ public virtual async ValueTask<T> DeserializeAsync(Stream stream)
 
 		public abstract string Serialize(T item);
 
-		public virtual async ValueTask SerializeAsync(Stream stream, T item)
+		public virtual async ValueTask SerializeAsync(Stream stream, T item, CancellationToken cancellationToken = default)
 		{
 			var text = Serialize(item);
 			using var writer = new StreamWriter(stream);