Updated.

electricessence · electricessence · commit fb63726fb75e · 2020-01-09T14:30:20.000-08:00
diff --git a/Open.Serialization.Json.Newtonsoft/JsonSerializerInternal.cs b/Open.Serialization.Json.Newtonsoft/JsonSerializerInternal.cs
@@ -2,7 +2,7 @@
 
 namespace Open.Serialization.Json.Newtonsoft
 {
-	internal class JsonSerializerInternal : SerializerBase, IJsonSerializer
+	internal class JsonSerializerInternal : JsonSerializerBase
 	{
 		readonly JsonSerializerSettings _settings;
 		internal JsonSerializerInternal(JsonSerializerSettings settings)
@@ -17,7 +17,7 @@ public override T Deserialize<T>(string? value)
 			=> JsonConvert.SerializeObject(item, _settings);
 	}
 
-	internal class JsonSerializerInternal<T> : Serializer<T>, IJsonSerializer<T>
+	internal class JsonSerializerInternal<T> : JsonSerializer<T>, IJsonSerializer<T>, IJsonAsyncSerializer<T>
 	{
 		internal JsonSerializerInternal(JsonSerializerSettings settings)
 			: base(settings.GetDeserialize<T>(), settings.GetSerialize<T>())
diff --git a/Open.Serialization.Json/IJsonAsyncObjectSerializer.cs b/Open.Serialization.Json/IJsonAsyncObjectSerializer.cs
@@ -0,0 +1,7 @@
+﻿namespace Open.Serialization.Json
+{
+	/// <inheritdoc />
+	public interface IJsonAsyncObjectSerializer : IAsyncObjectSerializer
+	{
+	}
+}
diff --git a/Open.Serialization.Json/IJsonAsyncSerializer.cs b/Open.Serialization.Json/IJsonAsyncSerializer.cs
@@ -0,0 +1,12 @@
+﻿namespace Open.Serialization.Json
+{
+	/// <inheritdoc />
+	public interface IJsonAsyncSerializer : IAsyncSerializer
+	{
+	}
+
+	/// <inheritdoc />
+	public interface IJsonAsyncSerializer<T> : IAsyncSerializer<T>
+	{
+	}
+}
diff --git a/Open.Serialization.Json/IJsonDeserialize.cs b/Open.Serialization.Json/IJsonDeserialize.cs
@@ -1,9 +1,11 @@
 ﻿namespace Open.Serialization.Json
 {
+	/// <inheritdoc />
 	public interface IJsonDeserialize : IDeserialize
 	{
 	}
 
+	/// <inheritdoc />
 	public interface IJsonDeserialize<out T> : IDeserialize<T>
 	{
 	}
diff --git a/Open.Serialization.Json/IJsonDeserializeAsync.cs b/Open.Serialization.Json/IJsonDeserializeAsync.cs
@@ -1,9 +1,11 @@
 ﻿namespace Open.Serialization.Json
 {
+	/// <inheritdoc />
 	public interface IJsonDeserializeAsync : IDeserializeAsync
 	{
 	}
 
+	/// <inheritdoc />
 	public interface IJsonDeserializeAsync<T> : IDeserializeAsync<T>
 	{
 	}
diff --git a/Open.Serialization.Json/IJsonDeserializeObject.cs b/Open.Serialization.Json/IJsonDeserializeObject.cs
@@ -1,5 +1,6 @@
 ﻿namespace Open.Serialization.Json
 {
+	/// <inheritdoc />
 	public interface IJsonDeserializeObject : IDeserializeObject
 	{
 	}
diff --git a/Open.Serialization.Json/IJsonDeserializeObjectAsync.cs b/Open.Serialization.Json/IJsonDeserializeObjectAsync.cs
@@ -1,5 +1,6 @@
 ﻿namespace Open.Serialization.Json
 {
+	/// <inheritdoc />
 	public interface IJsonDeserializeObjectAsync : IDeserializeObjectAsync
 	{
 	}
diff --git a/Open.Serialization.Json/IJsonObjectSerializationFactory.cs b/Open.Serialization.Json/IJsonObjectSerializationFactory.cs
@@ -0,0 +1,28 @@
+﻿namespace Open.Serialization.Json
+{
+	/// <summary>
+	/// Factory for generating JSON serializers and deserializers.
+	/// </summary>
+	public interface IJsonObjectSerializationFactory
+	{
+		/// <summary>
+		/// Returns the requested deserializer
+		/// </summary>
+		IJsonDeserializeObject GetDeserializer(bool caseSensitive = false);
+
+		/// <summary>
+		/// Returns the requested deserializer
+		/// </summary>
+		IJsonDeserializeObjectAsync GetAsyncDeserializer(bool caseSensitive = false);
+
+		/// <summary>
+		/// Returns the requested serializer
+		/// </summary>
+		IJsonSerializeObject GetSerializer(IJsonSerializationOptions? options = null);
+
+		/// <summary>
+		/// Returns the requested serializer
+		/// </summary>
+		IJsonSerializeObjectAsync GetAsyncSerializer(IJsonSerializationOptions? options = null);
+	}
+}
diff --git a/Open.Serialization.Json/IJsonObjectSerializer.cs b/Open.Serialization.Json/IJsonObjectSerializer.cs
@@ -0,0 +1,9 @@
+﻿namespace Open.Serialization.Json
+{
+	// Provided as a means of specificity when setting up DI.
+
+	/// <inheritdoc />
+	public interface IJsonObjectSerializer : IObjectSerializer, IJsonSerializeObject, IJsonDeserializeObject, IJsonDeserializeObjectAsync, IJsonSerializeObjectAsync
+	{
+	}
+}
diff --git a/Open.Serialization.Json/IJsonObjectSerializerFactory.cs b/Open.Serialization.Json/IJsonObjectSerializerFactory.cs
@@ -0,0 +1,13 @@
+﻿namespace Open.Serialization.Json
+{
+	/// <summary>
+	/// Factory for generating a JSON serializer/deserializer.
+	/// </summary>
+	public interface IJsonObjectSerializerFactory
+	{
+		/// <summary>
+		/// Returns the requested serializer
+		/// </summary>
+		IJsonObjectSerializer GetSerializer(IJsonSerializationOptions? options = null, bool caseSensitive = false);
+	}
+}
diff --git a/Open.Serialization.Json/IJsonSerializationFactory.cs b/Open.Serialization.Json/IJsonSerializationFactory.cs
@@ -1,11 +1,28 @@
 ﻿namespace Open.Serialization.Json
 {
+	/// <summary>
+	/// Factory for generating JSON generic serializers and deserializers.
+	/// </summary>
 	public interface IJsonSerializationFactory
 	{
+		/// <summary>
+		/// Returns the requested deserializer
+		/// </summary>
 		IJsonDeserialize GetDeserializer(bool caseSensitive = false);
+
+		/// <summary>
+		/// Returns the requested deserializer
+		/// </summary>
 		IJsonDeserializeAsync GetAsyncDeserializer(bool caseSensitive = false);
 
+		/// <summary>
+		/// Returns the requested serializer
+		/// </summary>
 		IJsonSerialize GetSerializer(IJsonSerializationOptions? options = null);
+
+		/// <summary>
+		/// Returns the requested serializer
+		/// </summary>
 		IJsonSerializeAsync GetAsyncSerializer(IJsonSerializationOptions? options = null);
 	}
 }
diff --git a/Open.Serialization.Json/IJsonSerialize.cs b/Open.Serialization.Json/IJsonSerialize.cs
@@ -1,9 +1,11 @@
 ﻿namespace Open.Serialization.Json
 {
+	/// <inheritdoc />
 	public interface IJsonSerialize : ISerialize
 	{
 	}
 
+	/// <inheritdoc />
 	public interface IJsonSerialize<in T> : ISerialize<T>
 	{
 	}
diff --git a/Open.Serialization.Json/IJsonSerializeAsync.cs b/Open.Serialization.Json/IJsonSerializeAsync.cs
@@ -1,9 +1,11 @@
 ﻿namespace Open.Serialization.Json
 {
+	/// <inheritdoc />
 	public interface IJsonSerializeAsync : ISerializeAsync
 	{
 	}
 
+	/// <inheritdoc />
 	public interface IJsonSerializeAsync<in T> : ISerializeAsync<T>
 	{
 	}
diff --git a/Open.Serialization.Json/IJsonSerializeObject.cs b/Open.Serialization.Json/IJsonSerializeObject.cs
@@ -1,6 +1,7 @@
 ﻿namespace Open.Serialization.Json
 {
-	interface IJsonSerializeObject : ISerializeObject
+	/// <inheritdoc />
+	public interface IJsonSerializeObject : ISerializeObject
 	{
 	}
 }
diff --git a/Open.Serialization.Json/IJsonSerializeObjectAsync.cs b/Open.Serialization.Json/IJsonSerializeObjectAsync.cs
@@ -0,0 +1,7 @@
+﻿namespace Open.Serialization.Json
+{
+	/// <inheritdoc />
+	public interface IJsonSerializeObjectAsync : ISerializeObjectAsync
+	{
+	}
+}
diff --git a/Open.Serialization.Json/IJsonSerializer.cs b/Open.Serialization.Json/IJsonSerializer.cs
@@ -2,10 +2,12 @@
 {
 	// Provided as a means of specificity when setting up DI.
 
+	/// <inheritdoc />
 	public interface IJsonSerializer : ISerializer, IJsonSerialize, IJsonDeserialize, IJsonDeserializeAsync, IJsonSerializeAsync
 	{
 	}
 
+	/// <inheritdoc />
 	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
@@ -1,7 +1,13 @@
 ﻿namespace Open.Serialization.Json
 {
+	/// <summary>
+	/// Factory for generating a JSON generic serializer/deserializer.
+	/// </summary>
 	public interface IJsonSerializerFactory
 	{
+		/// <summary>
+		/// Returns the requested serializer
+		/// </summary>
 		IJsonSerializer GetSerializer(IJsonSerializationOptions? options = null, bool caseSensitive = false);
 	}
 }
diff --git a/Open.Serialization.Json/JsonObjectSerializer.cs b/Open.Serialization.Json/JsonObjectSerializer.cs
@@ -0,0 +1,21 @@
+﻿using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Open.Serialization.Json
+{
+	/// <inheritdoc />
+	public class JsonObjectSerializer : ObjectSerializer, IJsonObjectSerializer, IJsonAsyncObjectSerializer
+	{
+		/// <inheritdoc />
+		public JsonObjectSerializer(
+			Func<string?, Type, object?>? deserializer,
+			Func<object?, Type, string?>? serializer = null,
+			Func<Stream, Type, CancellationToken, ValueTask<object?>>? deserializerAsync = null,
+			Func<Stream, object?, Type, CancellationToken, ValueTask>? serializerAsync = null)
+			: base(deserializer, serializer, deserializerAsync, serializerAsync)
+		{
+		}
+	}
+}
diff --git a/Open.Serialization.Json/JsonObjectSerializerBase.cs b/Open.Serialization.Json/JsonObjectSerializerBase.cs
@@ -0,0 +1,7 @@
+﻿namespace Open.Serialization.Json
+{
+	/// <inheritdoc />
+	public abstract class JsonObjectSerializerBase : ObjectSerializerBase, IJsonObjectSerializer, IJsonAsyncObjectSerializer
+	{
+	}
+}
diff --git a/Open.Serialization.Json/JsonSerializationOptions.cs b/Open.Serialization.Json/JsonSerializationOptions.cs
@@ -3,12 +3,16 @@
 	/// <inheritdoc />
 	public class JsonSerializationOptions : IJsonSerializationOptions
 	{
+		/// <inheritdoc />
 		public bool? CamelCaseProperties { get; set; }
 
+		/// <inheritdoc />
 		public bool? CamelCaseKeys { get; set; }
 
+		/// <inheritdoc />
 		public bool? OmitNull { get; set; }
 
+		/// <inheritdoc />
 		public bool? Indent { get; set; }
 	}
 }
diff --git a/Open.Serialization.Json/JsonSerializer.cs b/Open.Serialization.Json/JsonSerializer.cs
@@ -0,0 +1,21 @@
+﻿using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Open.Serialization.Json
+{
+	/// <inheritdoc />
+	public class JsonSerializer<T> : Serializer<T>, IJsonSerializer<T>, IJsonAsyncSerializer<T>
+	{
+		/// <inheritdoc />
+		public JsonSerializer(
+			Func<string?, T>? deserializer,
+			Func<T, string?>? serializer = null,
+			Func<Stream, CancellationToken, ValueTask<T>>? deserializerAsync = null,
+			Func<Stream, T, CancellationToken, ValueTask>? serializerAsync = null)
+			: base(deserializer, serializer, deserializerAsync, serializerAsync)
+		{
+		}
+	}
+}
diff --git a/Open.Serialization.Json/JsonSerializerBase.cs b/Open.Serialization.Json/JsonSerializerBase.cs
@@ -1,10 +1,15 @@
 ﻿namespace Open.Serialization.Json
 {
-	public abstract class JsonSerializerBase : SerializerBase, IJsonSerializer
+	/// <inheritdoc />
+	public abstract class JsonSerializerBase : SerializerBase, IJsonSerializer, IJsonAsyncSerializer
 	{
+		/// <inheritdoc cref="SerializerBase.Cast{T}" />
+		public new JsonSerializer<T> Cast<T>()
+			=> new JsonSerializer<T>(Deserialize<T>, Serialize, DeserializeAsync<T>, SerializeAsync);
 	}
 
-	public abstract class JsonSerializerBase<T> : SerializerBase<T>, IJsonSerializer<T>
+	/// <inheritdoc />
+	public abstract class JsonSerializerBase<T> : SerializerBase<T>, IJsonSerializer<T>, IJsonAsyncSerializer<T>
 	{
 	}
 }
diff --git a/Open.Serialization.Json/JsonSerializerFactoryBase.cs b/Open.Serialization.Json/JsonSerializerFactoryBase.cs
diff --git a/Open.Serialization.Json/Open.Serialization.Json.csproj b/Open.Serialization.Json/Open.Serialization.Json.csproj
@@ -17,16 +17,20 @@
 		<RepositoryUrl>https://github.com/electricessence/Open.Serialization</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 		<PackageTags>serialization json</PackageTags>
-		<Version>1.4.0</Version>
+		<Version>2.1.0</Version>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+	  <DocumentationFile>C:\Users\essence\Development\Open\Open.Serialization\Open.Serialization.Json\Open.Serialization.Json.xml</DocumentationFile>
+	</PropertyGroup>
+
 	<ItemGroup>
 	  <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
-	  <PackageReference Include="Open.Serialization" Version="1.5.0" />
+	  <PackageReference Include="Open.Serialization" Version="2.1.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/Open.Serialization.Json/Open.Serialization.Json.xml b/Open.Serialization.Json/Open.Serialization.Json.xml

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Open.Serialization.Json.Newtonsoft`
`4`	`4`	`{`
`5`		`- internal class JsonSerializerInternal : SerializerBase, IJsonSerializer`
	`5`	`+ internal class JsonSerializerInternal : JsonSerializerBase`
`6`	`6`	`{`
`7`	`7`	`readonly JsonSerializerSettings _settings;`
`8`	`8`	`internal JsonSerializerInternal(JsonSerializerSettings settings)`
`@@ -17,7 +17,7 @@ public override T Deserialize<T>(string? value)`
`17`	`17`	`=> JsonConvert.SerializeObject(item, _settings);`
`18`	`18`	`}`
`19`	`19`
`20`		`- internal class JsonSerializerInternal<T> : Serializer<T>, IJsonSerializer<T>`
	`20`	`+ internal class JsonSerializerInternal<T> : JsonSerializer<T>, IJsonSerializer<T>, IJsonAsyncSerializer<T>`
`21`	`21`	`{`
`22`	`22`	`internal JsonSerializerInternal(JsonSerializerSettings settings)`
`23`	`23`	`: base(settings.GetDeserialize<T>(), settings.GetSerialize<T>())`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`	`namespace Open.Serialization.Json`
`2`	`2`	`{`
	`3`	`+ /// <inheritdoc />`
`3`	`4`	`public interface IJsonDeserialize : IDeserialize`
`4`	`5`	`{`
`5`	`6`	`}`
`6`	`7`
	`8`	`+ /// <inheritdoc />`
`7`	`9`	`public interface IJsonDeserialize<out T> : IDeserialize<T>`
`8`	`10`	`{`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`namespace Open.Serialization.Json`
`2`	`2`	`{`
	`3`	`+ /// <inheritdoc />`
`3`	`4`	`public interface IJsonDeserializeObject : IDeserializeObject`
`4`	`5`	`{`
`5`	`6`	`}`