refactoring

Author: giometrix

src/TableStorage.Abstractions.POCO/IKeysConverter.cs

@@ -3,7 +3,7 @@
 
 namespace TableStorage.Abstractions.POCO
 {
-	public interface IKeysConverter<T, TPartitionKey, TRowKey> 
+	public interface IKeysConverter<T, in TPartitionKey, in TRowKey> 
 	{
 		DynamicTableEntity ToEntity(T obj);
 		T FromEntity(DynamicTableEntity entity);

src/TableStorage.Abstractions.POCO/KeyMapper.cs

@@ -5,25 +5,19 @@ namespace TableStorage.Abstractions.POCO
 {
 	public class KeyMapper<T, TKey>
 	{
-		private Func<T, string> _toKey;
-		private Func<TKey, string> _toKeyFromParameter;
-		private Func<string, TKey> _fromKey;
-		private Expression<Func<T, object>> _keyProperty;
+		private readonly Func<T, string> _toKey;
+		private readonly Func<TKey, string> _toKeyFromParameter;
+		private readonly Func<string, TKey> _fromKey;
+
 		public KeyMapper(Func<T, string> toKey, Func<string, TKey> fromKey, Expression<Func<T, object>> keyProperty, Func<TKey, string> toKeyFromParameter)
 		{
-			if (toKey == null) throw new ArgumentNullException(nameof(toKey));
-			//if (fromKey == null) throw new ArgumentNullException(nameof(fromKey));
-	
-			this._toKey = toKey;
+			this._toKey = toKey ?? throw new ArgumentNullException(nameof(toKey));
 			_fromKey = fromKey;
-			_keyProperty = keyProperty;
+			KeyProperty = keyProperty;
 			_toKeyFromParameter = toKeyFromParameter;
 		}
 
-		public Expression<Func<T, object>> KeyProperty
-		{
-			get { return _keyProperty; }
-		}
+		public Expression<Func<T, object>> KeyProperty { get; }
 
 		public string ToKey(T obj)
 		{