Renamed ICacheSerializer to CacheSerializerBase, added net461 target and removed test for checking the json output

Author: maca88

NHibernate.Caches.Common.Tests/BinaryCacheSerializerFixture.cs

@@ -10,6 +10,6 @@ namespace NHibernate.Caches.Common.Tests
 	[TestFixture]
 	public class BinaryCacheSerializerFixture : CacheSerializerFixture
 	{
-		protected override Func<ICacheSerializer> SerializerProvider => () => new BinaryCacheSerializer();
+		protected override Func<CacheSerializerBase> SerializerProvider => () => new BinaryCacheSerializer();
 	}
 }

NHibernate.Caches.Common.Tests/CacheSerializerFixture.cs

@@ -20,9 +20,9 @@ namespace NHibernate.Caches.Common.Tests
 	[TestFixture]
 	public abstract class CacheSerializerFixture
 	{
-		protected abstract Func<ICacheSerializer> SerializerProvider { get; }
+		protected abstract Func<CacheSerializerBase> SerializerProvider { get; }
 
-		protected ICacheSerializer DefaultSerializer { get; private set; }
+		protected CacheSerializerBase DefaultSerializer { get; private set; }
 
 		[OneTimeSetUp]
 		public void FixtureSetup()

NHibernate.Caches.Common/BinaryCacheSerializer.cs

@@ -4,10 +4,10 @@
 namespace NHibernate.Caches.Common
 {
 	/// <inheritdoc />
-	public class BinaryCacheSerializer : ICacheSerializer
+	public class BinaryCacheSerializer : CacheSerializerBase
 	{
 		/// <inheritdoc />
-		public byte[] Serialize(object value)
+		public override byte[] Serialize(object value)
 		{
 			var serializer = new BinaryFormatter();
 			using (var stream = new MemoryStream())
@@ -18,7 +18,7 @@ public byte[] Serialize(object value)
 		}
 
 		/// <inheritdoc />
-		public object Deserialize(byte[] value)
+		public override object Deserialize(byte[] value)
 		{
 			var serializer = new BinaryFormatter();
 			using (var stream = new MemoryStream(value))

…ernate.Caches.Common/ICacheSerializer.cs …ate.Caches.Common/CacheSerializerBase.csNHibernate.Caches.Common/ICacheSerializer.cs renamed to NHibernate.Caches.Common/CacheSerializerBase.cs NHibernate.Caches.Common/ICacheSerializer.cs renamed to NHibernate.Caches.Common/CacheSerializerBase.cs

@@ -7,22 +7,22 @@
 namespace NHibernate.Caches.Common
 {
 	/// <summary>
-	/// Defines methods for serializing objects that will be stored in a distributed cache.
+	/// Base class for serializing objects that will be stored in a distributed cache.
 	/// </summary>
-	public interface ICacheSerializer
+	public abstract class CacheSerializerBase
 	{
 		/// <summary>
 		/// Serialize the object.
 		/// </summary>
 		/// <param name="value">The object to serialize.</param>
 		/// <returns>The serialized object.</returns>
-		byte[] Serialize(object value);
+		public abstract byte[] Serialize(object value);
 
 		/// <summary>
 		/// Deserialize the object.
 		/// </summary>
 		/// <param name="data">The data of the object to deserialize.</param>
 		/// <returns>The deserialized object.</returns>
-		object Deserialize(byte[] data);
+		public abstract object Deserialize(byte[] data);
 	}
 }

NHibernate.Caches.Common/NHibernate.Caches.Common.csproj

@@ -4,7 +4,7 @@
     <Product>NHibernate.Caches.Common</Product>
     <Title>NHibernate.Caches.Common</Title>
     <Description>Common types of NHibernate.Caches providers.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

Util/NHibernate.Caches.Util.JsonSerializer.Tests/JsonCacheSerializerFixture.cs

@@ -16,7 +16,7 @@ namespace NHibernate.Caches.Util.JsonSerializer.Tests
 	[TestFixture]
 	public class JsonCacheSerializerFixture : CacheSerializerFixture
 	{
-		protected override Func<ICacheSerializer> SerializerProvider => CreateDefaultSerializer;
+		protected override Func<CacheSerializerBase> SerializerProvider => CreateDefaultSerializer;
 
 		[Test]
 		public void TestStrictSerialization()
@@ -26,68 +26,7 @@ public void TestStrictSerialization()
 				"Non standard types should be registered explicitly");
 		}
 
-		[Test]
-		public void TestAliasNames()
-		{
-			var original = new object[]
-			{
-				(short) 1,
-				(ushort) 2,
-				3,
-				(uint) 4,
-				(long) 5,
-				(ulong) 6,
-				(sbyte) 7,
-				(byte) 8,
-				9.1m,
-				10.2f,
-				11.3,
-				Guid.Empty,
-				'a',
-				TimeSpan.FromTicks(1234),
-				DateTimeOffset.FromUnixTimeSeconds(100),
-				new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc),
-				new byte[] {12},
-				new List<object>{13},
-				new Hashtable{{14, 14}},
-				// TODO: add missing NH types when upgraded to 5.2
-				new UnfetchedLazyProperty(),
-				new UnknownBackrefProperty()
-			};
-			var expectedJson =
-				"{\"$t\":\"oa\",\"$vs\":[" +
-					"{\"$t\":\"s\",\"$v\":1}," +
-					"{\"$t\":\"us\",\"$v\":2}," +
-					"{\"$t\":\"i\",\"$v\":3}," +
-					"{\"$t\":\"ui\",\"$v\":4}," +
-					"5," +
-					"{\"$t\":\"ul\",\"$v\":6}," +
-					"{\"$t\":\"sb\",\"$v\":7}," +
-					"{\"$t\":\"b\",\"$v\":8}," +
-					"{\"$t\":\"d\",\"$v\":9.1}," +
-					"{\"$t\":\"f\",\"$v\":10.2}," +
-					"11.3," +
-					"{\"$t\":\"g\",\"$v\":\"00000000-0000-0000-0000-000000000000\"}," +
-					"{\"$t\":\"c\",\"$v\":\"a\"}," +
-					"{\"$t\":\"ts\",\"$v\":\"00:00:00.0001234\"}," +
-					"{\"$t\":\"do\",\"$v\":\"1970-01-01T00:01:40+00:00\"}," +
-					"\"2000-01-01T00:00:00Z\"," +
-					"{\"$t\":\"ba\",\"$v\":\"DA==\"}," +
-					"{\"$t\":\"lo\",\"$vs\":[{\"$t\":\"i\",\"$v\":13}]}," +
-					"{\"$t\":\"ht\",\"i:14\":{\"$t\":\"i\",\"$v\":14}}," +
-					"{\"$t\":\"up\"}," +
-					"{\"$t\":\"ub\"}" +
-				"]}";
-			var data = DefaultSerializer.Serialize(original);
-			var json = Encoding.UTF8.GetString(data);
-			Assert.That(json, Is.EqualTo(expectedJson));
-
-			var copy = DefaultSerializer.Deserialize(data);
-
-			AssertEqual(original, copy);
-		}
-
-		private ICacheSerializer CreateDefaultSerializer()
+		private CacheSerializerBase CreateDefaultSerializer()
 		{
 			var serializer = new JsonCacheSerializer();
 			serializer.RegisterType(typeof(CustomEntity), "cue");

Util/NHibernate.Caches.Util.JsonSerializer/JsonCacheSerializer.cs

@@ -24,7 +24,7 @@ namespace NHibernate.Caches.Util.JsonSerializer
 	/// not yield only basic value types or array of them, their return type has to be registered explicitly
 	/// by <see cref="RegisterType(System.Type, string)"/> method.
 	/// </summary>
-	public class JsonCacheSerializer : ICacheSerializer
+	public class JsonCacheSerializer : CacheSerializerBase
 	{
 		private const string TypeMetadataName = "$type";
 		private const string ShortTypeMetadataName = "$t";
@@ -151,7 +151,7 @@ public void RegisterType(System.Type type, string alias, Action<JsonContract> se
 		}
 
 		/// <inheritdoc />
-		public object Deserialize(byte[] value)
+		public override object Deserialize(byte[] value)
 		{
 			using (var reader = new CustomJsonTextReader(new StringReader(Encoding.UTF8.GetString(value))))
 			{
@@ -160,7 +160,7 @@ public object Deserialize(byte[] value)
 		}
 
 		/// <inheritdoc />
-		public byte[] Serialize(object value)
+		public override byte[] Serialize(object value)
 		{
 			using (var stringWriter = new StringWriter(new StringBuilder(256), CultureInfo.InvariantCulture))
 			using (var writer = new CustomJsonTextWriter(stringWriter))

Util/NHibernate.Caches.Util.JsonSerializer/NHibernate.Caches.Util.JsonSerializer.csproj

@@ -4,7 +4,7 @@
     <Product>NHibernate.Caches.Util.JsonSerializer</Product>
     <Title>NHibernate.Caches.Util.JsonSerializer</Title>
     <Description>Json.NET serializer for distributed NHibernate.Caches providers.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>