Revised interfaces to allow for casting to specific serializer.

Oren (electricessence) · Oren (electricessence) · commit 90c0963a8a8d · 2019-10-28T17:19:23.000-07:00
diff --git a/Open.Serialization.Json/IJsonDeserialize.cs b/Open.Serialization.Json/IJsonDeserialize.cs
@@ -0,0 +1,10 @@
+﻿namespace Open.Serialization.Json
+{
+	public interface IJsonDeserialize : IDeserialize
+	{
+	}
+
+	public interface IJsonDeserialize<T> : IDeserialize<T>
+	{
+	}
+}
diff --git a/Open.Serialization.Json/IJsonDeserializeAsync.cs b/Open.Serialization.Json/IJsonDeserializeAsync.cs
@@ -0,0 +1,10 @@
+﻿namespace Open.Serialization.Json
+{
+	public interface IJsonDeserializeAsync : IDeserializeAsync
+	{
+	}
+
+	public interface IJsonDeserializeAsync<T> : IDeserializeAsync<T>
+	{
+	}
+}
diff --git a/Open.Serialization.Json/IJsonSerialize.cs b/Open.Serialization.Json/IJsonSerialize.cs
@@ -0,0 +1,10 @@
+﻿namespace Open.Serialization.Json
+{
+	public interface IJsonSerialize : ISerialize
+	{
+	}
+
+	public interface IJsonSerialize<T> : ISerialize<T>
+	{
+	}
+}
diff --git a/Open.Serialization.Json/IJsonSerializeAsync.cs b/Open.Serialization.Json/IJsonSerializeAsync.cs
@@ -0,0 +1,10 @@
+﻿namespace Open.Serialization.Json
+{
+	public interface IJsonSerializeAsync : ISerializeAsync
+	{
+	}
+
+	public interface IJsonSerializeAsync<T> : ISerializeAsync<T>
+	{
+	}
+}
diff --git a/Open.Serialization.Json/IJsonSerializer.cs b/Open.Serialization.Json/IJsonSerializer.cs
@@ -2,11 +2,11 @@
 {
 	// Provided as a means of specificity when setting up DI.
 
-	public interface IJsonSerializer : ISerializer
+	public interface IJsonSerializer : ISerializer, IJsonSerialize, IJsonDeserialize, IJsonDeserializeAsync, IJsonSerializeAsync
 	{
 	}
 
-	public interface IJsonSerializer<T> : ISerializer<T>
+	public interface IJsonSerializer<T> : ISerializer<T>, IJsonSerialize<T>, IJsonDeserialize<T>, IJsonDeserializeAsync<T>, IJsonSerializeAsync<T>
 	{
 	}
 }
diff --git a/Open.Serialization.Json/IJsonSerializerFactory.cs b/Open.Serialization.Json/IJsonSerializerFactory.cs
@@ -2,10 +2,10 @@
 {
 	public interface IJsonSerializerFactory
 	{
-		IDeserialize GetDeserializer(bool caseSensitive = false);
-		IDeserializeAsync GetAsyncDeserializer(bool caseSensitive = false);
+		IJsonDeserialize GetDeserializer(bool caseSensitive = false);
+		IJsonDeserializeAsync GetAsyncDeserializer(bool caseSensitive = false);
 
-		ISerialize GetSerializer(IJsonSerializationOptions options = null);
-		ISerializeAsync GetAsyncSerializer(IJsonSerializationOptions options = null);
+		IJsonSerialize GetSerializer(IJsonSerializationOptions options = null);
+		IJsonSerializeAsync GetAsyncSerializer(IJsonSerializationOptions options = null);
 	}
 }
diff --git a/Open.Serialization.Json/JsonSerializerBase.cs b/Open.Serialization.Json/JsonSerializerBase.cs
@@ -0,0 +1,14 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Open.Serialization.Json
+{
+	public abstract class JsonSerializerBase : SerializerBase, IJsonSerializer
+	{
+	}
+
+	public abstract class JsonSerializerBase<T> : SerializerBase<T>, IJsonSerializer<T>
+	{
+	}
+}
diff --git a/Open.Serialization.Json/JsonSerializerFactoryBase.cs b/Open.Serialization.Json/JsonSerializerFactoryBase.cs
@@ -2,20 +2,20 @@
 {
 	public abstract class JsonSerializerFactoryBase : IJsonSerializerFactory
 	{
-		protected abstract SerializerBase GetDeserializerInternal(bool caseSensitive);
+		protected abstract JsonSerializerBase GetDeserializerInternal(bool caseSensitive);
 
-		public IDeserialize GetDeserializer(bool caseSensitive = false)
+		public IJsonDeserialize GetDeserializer(bool caseSensitive = false)
 			=> GetDeserializerInternal(caseSensitive);
 
-		public IDeserializeAsync GetAsyncDeserializer(bool caseSensitive = false)
+		public IJsonDeserializeAsync GetAsyncDeserializer(bool caseSensitive = false)
 			=> GetDeserializerInternal(caseSensitive);
 
-		protected abstract SerializerBase GetSerializerInternal(IJsonSerializationOptions options);
+		protected abstract JsonSerializerBase GetSerializerInternal(IJsonSerializationOptions options);
 
-		public ISerialize GetSerializer(IJsonSerializationOptions options = null)
+		public IJsonSerialize GetSerializer(IJsonSerializationOptions options = null)
 			=> GetSerializerInternal(options);
 
-		public ISerializeAsync GetAsyncSerializer(IJsonSerializationOptions options = null)
+		public IJsonSerializeAsync GetAsyncSerializer(IJsonSerializationOptions options = null)
 			=> GetSerializerInternal(options);
 	}
 }
diff --git a/Open.Serialization.Json/Open.Serialization.Json.csproj b/Open.Serialization.Json/Open.Serialization.Json.csproj
@@ -21,7 +21,7 @@ Part of the "Open" set of libraries.
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Open.Serialization" Version="1.0.0" />
+    <PackageReference Include="Open.Serialization" Version="1.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Open.Serialization/ISerializer.cs b/Open.Serialization/ISerializer.cs
@@ -5,6 +5,7 @@
 	/// </summary>
 	public interface ISerializer : ISerialize, IDeserialize
 	{
+		ISerializer<T> Cast<T>();
 	}
 
 	/// <summary>
@@ -19,6 +20,7 @@ public interface ISerializer<T> : ISerialize<T>, IDeserialize<T>
 	/// </summary>
 	public interface IAsyncSerializer : ISerializeAsync, IDeserializeAsync
 	{
+		IAsyncSerializer<T> Cast<T>();
 	}
 
 	/// <summary>
diff --git a/Open.Serialization/Open.Serialization.csproj b/Open.Serialization/Open.Serialization.csproj
@@ -15,7 +15,7 @@ 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.0</Version>
+		<Version>1.1.1</Version>
 	</PropertyGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
diff --git a/Open.Serialization/SerializerBase.cs b/Open.Serialization/SerializerBase.cs
@@ -15,7 +15,6 @@ public virtual async ValueTask<T> DeserializeAsync<T>(Stream stream)
 			return Deserialize<T>(text);
 		}
 
-
 		public abstract string Serialize<T>(T item);
 
 		public virtual async ValueTask SerializeAsync<T>(Stream stream, T item)
@@ -24,6 +23,12 @@ public virtual async ValueTask SerializeAsync<T>(Stream stream, T item)
 			using var writer = new StreamWriter(stream);
 			await writer.WriteAsync(text);
 		}
+
+		public Serializer<T> Cast<T>()
+			=> new Serializer<T>(Deserialize<T>, Serialize, DeserializeAsync<T>, SerializeAsync);
+
+		ISerializer<T> ISerializer.Cast<T>() => Cast<T>();
+		IAsyncSerializer<T> IAsyncSerializer.Cast<T>() => Cast<T>();
 	}
 
 	public abstract class SerializerBase<T> : ISerializer<T>, IAsyncSerializer<T>

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`	`{`
`3`	`3`	`// Provided as a means of specificity when setting up DI.`
`4`	`4`
`5`		`- public interface IJsonSerializer : ISerializer`
	`5`	`+ public interface IJsonSerializer : ISerializer, IJsonSerialize, IJsonDeserialize, IJsonDeserializeAsync, IJsonSerializeAsync`
`6`	`6`	`{`
`7`	`7`	`}`
`8`	`8`
`9`		`- public interface IJsonSerializer<T> : ISerializer<T>`
	`9`	`+ public interface IJsonSerializer<T> : ISerializer<T>, IJsonSerialize<T>, IJsonDeserialize<T>, IJsonDeserializeAsync<T>, IJsonSerializeAsync<T>`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`	`{`
`3`	`3`	`public interface IJsonSerializerFactory`
`4`	`4`	`{`
`5`		`- IDeserialize GetDeserializer(bool caseSensitive = false);`
`6`		`- IDeserializeAsync GetAsyncDeserializer(bool caseSensitive = false);`
	`5`	`+ IJsonDeserialize GetDeserializer(bool caseSensitive = false);`
	`6`	`+ IJsonDeserializeAsync GetAsyncDeserializer(bool caseSensitive = false);`
`7`	`7`
`8`		`- ISerialize GetSerializer(IJsonSerializationOptions options = null);`
`9`		`- ISerializeAsync GetAsyncSerializer(IJsonSerializationOptions options = null);`
	`8`	`+ IJsonSerialize GetSerializer(IJsonSerializationOptions options = null);`
	`9`	`+ IJsonSerializeAsync GetAsyncSerializer(IJsonSerializationOptions options = null);`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,20 +2,20 @@`
`2`	`2`	`{`
`3`	`3`	`public abstract class JsonSerializerFactoryBase : IJsonSerializerFactory`
`4`	`4`	`{`
`5`		`- protected abstract SerializerBase GetDeserializerInternal(bool caseSensitive);`
	`5`	`+ protected abstract JsonSerializerBase GetDeserializerInternal(bool caseSensitive);`
`6`	`6`
`7`		`- public IDeserialize GetDeserializer(bool caseSensitive = false)`
	`7`	`+ public IJsonDeserialize GetDeserializer(bool caseSensitive = false)`
`8`	`8`	`=> GetDeserializerInternal(caseSensitive);`
`9`	`9`
`10`		`- public IDeserializeAsync GetAsyncDeserializer(bool caseSensitive = false)`
	`10`	`+ public IJsonDeserializeAsync GetAsyncDeserializer(bool caseSensitive = false)`
`11`	`11`	`=> GetDeserializerInternal(caseSensitive);`
`12`	`12`
`13`		`- protected abstract SerializerBase GetSerializerInternal(IJsonSerializationOptions options);`
	`13`	`+ protected abstract JsonSerializerBase GetSerializerInternal(IJsonSerializationOptions options);`
`14`	`14`
`15`		`- public ISerialize GetSerializer(IJsonSerializationOptions options = null)`
	`15`	`+ public IJsonSerialize GetSerializer(IJsonSerializationOptions options = null)`
`16`	`16`	`=> GetSerializerInternal(options);`
`17`	`17`
`18`		`- public ISerializeAsync GetAsyncSerializer(IJsonSerializationOptions options = null)`
	`18`	`+ public IJsonSerializeAsync GetAsyncSerializer(IJsonSerializationOptions options = null)`
`19`	`19`	`=> GetSerializerInternal(options);`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`/// </summary>`
`6`	`6`	`public interface ISerializer : ISerialize, IDeserialize`
`7`	`7`	`{`
	`8`	`+ ISerializer<T> Cast<T>();`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`/// <summary>`
`@@ -19,6 +20,7 @@ public interface ISerializer<T> : ISerialize<T>, IDeserialize<T>`
`19`	`20`	`/// </summary>`
`20`	`21`	`public interface IAsyncSerializer : ISerializeAsync, IDeserializeAsync`
`21`	`22`	`{`
	`23`	`+ IAsyncSerializer<T> Cast<T>();`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`/// <summary>`