Code cleanup

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH2664Dynamic/Fixture.cs

@@ -103,4 +103,4 @@ public void Multiple_Query_Does_Not_Cache()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/NHSpecificTest/NH2664Dynamic/Mappings.hbm.xml

@@ -14,4 +14,4 @@
 
 	</class>
 
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH2664Dynamic/Product.cs

@@ -6,4 +6,4 @@ public class Product
 
 		public virtual dynamic Properties { get; set; }
 	}
-}
+}

src/NHibernate/Properties/MapAccessor.cs

@@ -1,33 +1,42 @@
-using System.Collections;
-using System.Reflection;
-using NHibernate.Engine;
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using Microsoft.CSharp.RuntimeBinder;
+using NHibernate.Engine;
 using Binder = Microsoft.CSharp.RuntimeBinder.Binder;
 
 namespace NHibernate.Properties
 {
 	[Serializable]
 	public class MapAccessor : IPropertyAccessor
-	{		
-		public IGetter GetGetter(System.Type theClass, string propertyName) => new MapGetter(propertyName);
+	{
+		public IGetter GetGetter(System.Type theClass, string propertyName)
+		{
+			return new MapGetter(propertyName);
+		}
 
-		public ISetter GetSetter(System.Type theClass, string propertyName) => new MapSetter(propertyName);
+		public ISetter GetSetter(System.Type theClass, string propertyName)
+		{
+			return new MapSetter(propertyName);
+		}
 
 		public bool CanAccessThroughReflectionOptimizer => false;
 
 		[Serializable]
 		public sealed class MapSetter : ISetter
 		{
-			private static readonly ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object, object>>> SetMemberSites =
-				new ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object, object>>>();
+			private static readonly ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object, object>>>
+				SetMemberSites = new ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object, object>>>();
 
-			private readonly string _name;
+			private readonly string name;
 
-			internal MapSetter(string name) => _name = name;
+			internal MapSetter(string name)
+			{
+				this.name = name;
+			}
 
 			public MethodInfo Method => null;
 
@@ -38,14 +47,14 @@ public void Set(object target, object value)
 				switch (target)
 				{
 					case IDictionary d:
-						d[_name] = value;
+						d[name] = value;
 						break;
 					case IDictionary<string, object> d:
-						d[_name] = value;
+						d[name] = value;
 						break;
 					default:
 						var site = SetMemberSites.GetOrAdd(
-							System.Tuple.Create(target.GetType(), _name),
+							System.Tuple.Create(target.GetType(), name),
 							t => CallSite<Func<CallSite, object, object, object>>.Create(
 								Binder.GetMember(
 									CSharpBinderFlags.None,
@@ -62,44 +71,50 @@ public void Set(object target, object value)
 				}
 			}
 		}
-		
+
 		[Serializable]
 		public sealed class MapGetter : IGetter
 		{
-			private static readonly ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object>>> GetMemberSites =
-				new ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object>>>();
+			private static readonly ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object>>>
+				GetMemberSites = new ConcurrentDictionary<Tuple<System.Type, string>, CallSite<Func<CallSite, object, object>>>();
 
-			private readonly string _name;
+			private readonly string name;
 
-			internal MapGetter(string name) => _name = name;
+			internal MapGetter(string name)
+			{
+				this.name = name;
+			}
 
 			public MethodInfo Method => null;
 
 			public string PropertyName => null;
 
 			public System.Type ReturnType => typeof(object);
 
-			public object GetForInsert(object owner, IDictionary mergeMap, ISessionImplementor session) => Get(owner);
+			public object GetForInsert(object owner, IDictionary mergeMap, ISessionImplementor session)
+			{
+				return Get(owner);
+			}
 
 			public object Get(object target)
 			{
 				switch (target)
 				{
 					case IDictionary d:
-						return d[_name];
+						return d[name];
 					case IDictionary<string, object> d:
-						d.TryGetValue(_name, out var result);
+						d.TryGetValue(name, out var result);
 						return result;
 					default:
 						var site = GetMemberSites.GetOrAdd(
-							System.Tuple.Create(target.GetType(), _name),
+							System.Tuple.Create(target.GetType(), name),
 							t => CallSite<Func<CallSite, object, object>>.Create(
 								Binder.GetMember(
 									CSharpBinderFlags.None,
 									t.Item2,
 									t.Item1,
 									new[] {CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null)})));
-						
+
 						return site.Target(site, target);
 				}
 			}