Removed Getter/Setter in favor of GetPropertyValueInvoker and SetPropertyValueInvoker delegates

Author: maca88

src/NHibernate/Bytecode/Lightweight/AccessOptimizer.cs

@@ -11,31 +11,34 @@ public class AccessOptimizer : IAccessOptimizer
 		private readonly SetPropertyValuesInvoker setDelegate;
 		private readonly GetterCallback getterCallback;
 		private readonly SetterCallback setterCallback;
-		private readonly Getter[] _getters;
-		private readonly Setter[] _setters;
-		private readonly Getter _specializedGetter;
-		private readonly Setter _specializedSetter;
+		private readonly GetPropertyValueInvoker[] _getters;
+		private readonly SetPropertyValueInvoker[] _setters;
+		private readonly GetPropertyValueInvoker _specializedGetter;
+		private readonly SetPropertyValueInvoker _specializedSetter;
 
 		// Since 5.3
 		[Obsolete("This constructor has no usages and will be removed in a future version")]
-		public AccessOptimizer(GetPropertyValuesInvoker getDelegate, SetPropertyValuesInvoker setDelegate,
-		                       IGetter[] getters, ISetter[] setters)
+		public AccessOptimizer(
+			GetPropertyValuesInvoker getDelegate,
+			SetPropertyValuesInvoker setDelegate,
+			IGetter[] getters,
+			ISetter[] setters)
 			: this(
 				getDelegate,
-				setDelegate, 
-				getters.Select(o => new Getter(o)).ToArray(),
-				setters.Select(o => new Setter(o)).ToArray(),
+				setDelegate,
+				getters.Select(o => (GetPropertyValueInvoker) o.Get).ToArray(),
+				setters.Select(o => (SetPropertyValueInvoker) o.Set).ToArray(),
 				null,
 				null)
 		{
 		}
 
 		public AccessOptimizer(GetPropertyValuesInvoker getDelegate,
 								SetPropertyValuesInvoker setDelegate,
-								Getter[] getters,
-								Setter[] setters,
-								Getter specializedGetter,
-								Setter specializedSetter)
+								GetPropertyValueInvoker[] getters,
+								SetPropertyValueInvoker[] setters,
+								GetPropertyValueInvoker specializedGetter,
+								SetPropertyValueInvoker specializedSetter)
 		{
 			this.getDelegate = getDelegate;
 			this.setDelegate = setDelegate;
@@ -77,26 +80,14 @@ internal object GetSpecializedPropertyValue(object target)
 			return GetPropertyValue(target, _specializedGetter);
 		}
 
-		private static object GetPropertyValue(object target, Getter getter)
+		private static object GetPropertyValue(object target, GetPropertyValueInvoker getter)
 		{
-			if (getter.Optimized == null)
-			{
-				return getter.Default.Get(target);
-			}
-
-			return getter.Optimized(target);
+			return getter(target);
 		}
 
-		private static void SetPropertyValue(object target, object value, Setter setter)
+		private static void SetPropertyValue(object target, object value, SetPropertyValueInvoker setter)
 		{
-			if (setter.Optimized == null)
-			{
-				setter.Default.Set(target, value);
-			}
-			else
-			{
-				setter.Optimized(target, value);
-			}
+			setter(target, value);
 		}
 	}
 }

src/NHibernate/Bytecode/Lightweight/Delegates.cs

@@ -6,7 +6,11 @@ namespace NHibernate.Bytecode.Lightweight
 
 	public delegate object[] GetPropertyValuesInvoker(object obj, GetterCallback callback);
 
+	public delegate object GetPropertyValueInvoker(object obj);
+
 	public delegate void SetPropertyValuesInvoker(object obj, object[] values, SetterCallback callback);
 
+	public delegate void SetPropertyValueInvoker(object obj, object value);
+
 	public delegate object CreateInstanceInvoker();
 }

src/NHibernate/Bytecode/Lightweight/Getter.cs

@@ -56,25 +56,25 @@ public ReflectionOptimizer(System.Type mappedType, IGetter[] getters, ISetter[]
 			GetPropertyValuesInvoker getInvoker = GenerateGetPropertyValuesMethod(getters);
 			SetPropertyValuesInvoker setInvoker = GenerateSetPropertyValuesMethod(setters);
 
-			var getMethods = new Getter[getters.Length];
+			var getMethods = new GetPropertyValueInvoker[getters.Length];
 			for (var i = 0; i < getters.Length; i++)
 			{
-				getMethods[i] = new Getter(getters[i], GenerateGetPropertyValueMethod(getters[i]));
+				getMethods[i] = GenerateGetPropertyValueMethod(getters[i]) ?? getters[i].Get;
 			}
 
-			var setMethods = new Setter[setters.Length];
+			var setMethods = new SetPropertyValueInvoker[setters.Length];
 			for (var i = 0; i < setters.Length; i++)
 			{
-				setMethods[i] = new Setter(setters[i], GenerateSetPropertyValueMethod(setters[i]));
+				setMethods[i] = GenerateSetPropertyValueMethod(setters[i]) ?? setters[i].Set;
 			}
 
 			accessOptimizer = new AccessOptimizer(
 				getInvoker,
 				setInvoker,
 				getMethods,
 				setMethods,
-				new Getter(specializedGetter, GenerateGetPropertyValueMethod(specializedGetter)),
-				new Setter(specializedSetter, GenerateSetPropertyValueMethod(specializedSetter))
+				GenerateGetPropertyValueMethod(specializedGetter),
+				GenerateSetPropertyValueMethod(specializedSetter)
 			);
 
 			createInstanceMethod = CreateCreateInstanceMethod(mappedType);
@@ -162,7 +162,7 @@ private static void EmitCastToReference(ILGenerator il, System.Type type)
 		private static readonly MethodInfo GetterCallbackInvoke = ReflectHelper.GetMethod<GetterCallback>(
 			g => g.Invoke(null, 0));
 
-		private Func<object, object> GenerateGetPropertyValueMethod(IGetter getter)
+		private GetPropertyValueInvoker GenerateGetPropertyValueMethod(IGetter getter)
 		{
 			if (!(getter is IOptimizableGetter optimizableGetter))
 			{
@@ -179,10 +179,10 @@ private Func<object, object> GenerateGetPropertyValueMethod(IGetter getter)
 			EmitUtil.EmitBoxIfNeeded(il, getter.ReturnType);
 			il.Emit(OpCodes.Ret);
 
-			return (Func<object, object>) method.CreateDelegate(typeof(Func<object, object>));
+			return (GetPropertyValueInvoker) method.CreateDelegate(typeof(GetPropertyValueInvoker));
 		}
 
-		private Action<object, object> GenerateSetPropertyValueMethod(ISetter setter)
+		private SetPropertyValueInvoker GenerateSetPropertyValueMethod(ISetter setter)
 		{
 			if (!(setter is IOptimizableSetter optimizableSetter))
 			{
@@ -199,7 +199,7 @@ private Action<object, object> GenerateSetPropertyValueMethod(ISetter setter)
 			optimizableSetter.Emit(il);
 			il.Emit(OpCodes.Ret);
 
-			return (Action<object, object>) method.CreateDelegate(typeof(Action<object, object>));
+			return (SetPropertyValueInvoker) method.CreateDelegate(typeof(SetPropertyValueInvoker));
 		}
 
 		/// <summary>