Avoid custom registration for the Json serializer (#117)

Author: fredericDelaporte

CoreDistributedCache/NHibernate.Caches.CoreDistributedCache.Tests/Async/CoreDistributedCacheFixture.cs

@@ -78,7 +78,7 @@ public async Task CanUseCacheKeyWithJsonSerializerAsync()
 			const string value = "valuePut";
 
 			var props = GetDefaultProperties();
-			props["cache.serializer"] = typeof(DistributedCacheJsonSerializer).AssemblyQualifiedName;
+			props["cache.serializer"] = typeof(JsonCacheSerializer).AssemblyQualifiedName;
 			var cache = (CacheBase) DefaultProvider.BuildCache(DefaultRegion, props);
 			// Due to async version, it may already be there.
 			await (cache.RemoveAsync(key, CancellationToken.None));

CoreDistributedCache/NHibernate.Caches.CoreDistributedCache.Tests/CoreDistributedCacheFixture.cs

@@ -73,7 +73,7 @@ public void CanUseCacheKeyWithJsonSerializer()
 			const string value = "valuePut";
 
 			var props = GetDefaultProperties();
-			props["cache.serializer"] = typeof(DistributedCacheJsonSerializer).AssemblyQualifiedName;
+			props["cache.serializer"] = typeof(JsonCacheSerializer).AssemblyQualifiedName;
 			var cache = (CacheBase) DefaultProvider.BuildCache(DefaultRegion, props);
 			// Due to async version, it may already be there.
 			cache.Remove(key);
@@ -85,13 +85,5 @@ public void CanUseCacheKeyWithJsonSerializer()
 			Assert.That(item, Is.Not.Null, "Unable to retrieve cached item");
 			Assert.That(item, Is.EqualTo(value), "didn't return the item we added");
 		}
-
-		private class DistributedCacheJsonSerializer : JsonCacheSerializer
-		{
-			public DistributedCacheJsonSerializer()
-			{
-				RegisterType(typeof(Tuple<string, object>), "tso");
-			}
-		}
 	}
 }

CoreDistributedCache/NHibernate.Caches.CoreDistributedCache/Async/CoreDistributedCache.cs

@@ -40,8 +40,10 @@ public override async Task<object> GetAsync(object key, CancellationToken cancel
 			if (cachedData == null)
 				return null;
 
-			var entry = _serializer.Deserialize(cachedData) as Tuple<string, object>;
-			return Equals(entry?.Item1, fullKey) ? entry.Item2 : null;
+			var entry = _serializer.Deserialize(cachedData) as object[];
+			if (entry == null || entry.Length != 2)
+				return null;
+			return Equals(entry[0], fullKey) ? entry[1] : null;
 		}
 
 		/// <inheritdoc />
@@ -64,7 +66,7 @@ public override Task PutAsync(object key, object value, CancellationToken cancel
 			{
 
 				var (fullKey, cacheKey) = GetCacheKey(key);
-				var entry = new Tuple<string, object>(fullKey, value);
+				var entry = new object[] { fullKey, value };
 				var cachedData = _serializer.Serialize(entry);
 
 				var options = new DistributedCacheEntryOptions();

CoreDistributedCache/NHibernate.Caches.CoreDistributedCache/CoreDistributedCache.cs

@@ -357,8 +357,10 @@ public override object Get(object key)
 			if (cachedData == null)
 				return null;
 
-			var entry = _serializer.Deserialize(cachedData) as Tuple<string, object>;
-			return Equals(entry?.Item1, fullKey) ? entry.Item2 : null;
+			var entry = _serializer.Deserialize(cachedData) as object[];
+			if (entry == null || entry.Length != 2)
+				return null;
+			return Equals(entry[0], fullKey) ? entry[1] : null;
 		}
 
 		/// <inheritdoc />
@@ -375,7 +377,7 @@ public override void Put(object key, object value)
 			}
 
 			var (fullKey, cacheKey) = GetCacheKey(key);
-			var entry = new Tuple<string, object>(fullKey, value);
+			var entry = new object[] { fullKey, value };
 			var cachedData = _serializer.Serialize(entry);
 
 			var options = new DistributedCacheEntryOptions();