Add ability to use dynamic component in any format

Author: hazzik

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

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH1039Dynamic
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		public override string BugNumber => "NH1039Dynamic";
+
+		protected override void OnTearDown()
+		{
+			base.OnTearDown();
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+				s.Delete("from Person");
+				tx.Commit();
+			}
+		}
+
+		[Test]
+		public void Test()
+		{
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
+			{
+				var person = new Person("1")
+				{
+					Name = "John Doe",
+					Properties =
+					{
+						Phones = new HashSet<object> {"555-1234", "555-4321"}
+					}
+				};
+
+				s.Save(person);
+				tx.Commit();
+			}
+			using (var s = OpenSession())
+			using (s.BeginTransaction())
+			{
+				var person = (Person) s.CreateCriteria(typeof(Person)).UniqueResult();
+
+				Assert.That(person.ID, Is.EqualTo("1"));
+				Assert.That(person.Name, Is.EqualTo("John Doe"));
+				var phones = person.Properties.Phones as ISet<object>;
+				Assert.That(phones, Is.Not.Null);
+				Assert.That(phones.Contains("555-1234"), Is.True);
+				Assert.That(phones.Contains("555-4321"), Is.True);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+				   namespace="NHibernate.Test.NHSpecificTest.NH1039Dynamic"
+				   assembly="NHibernate.Test">
+
+	<class name="Person" table="NH1039_Person">
+		<id name="ID" type="string" length="32">
+			<generator class="assigned"/>
+		</id>
+
+		<property name="Name"/>
+
+		<dynamic-component name="Properties">
+			<set name="Phones" table="NH1039_Phone">
+				<key column="PersonId"/>
+				<element column="`Number`" type="string"/>
+			</set>
+		</dynamic-component>
+	</class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH1039Dynamic/Model.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH1039Dynamic
+{
+	public class Person
+	{
+		public Person()
+		{
+		}
+
+		public Person(string id)
+		{
+			ID = id;
+		}
+
+		public virtual string ID { get; set; }
+
+		public virtual string Name { get; set; }
+
+		public virtual dynamic Properties { get; set; } = new ExpandoObject();
+	}
+}

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

@@ -2,6 +2,7 @@
 using System.Linq;
 using NUnit.Framework;
 using System.Collections.Generic;
+using System.Dynamic;
 using System.Linq.Dynamic.Core;
 
 namespace NHibernate.Test.NHSpecificTest.NH2664Dynamic
@@ -22,37 +23,38 @@ protected override void OnSetUp()
 			using (var session = OpenSession())
 			using (var tran = session.BeginTransaction())
 			{
+				var properties1 = new Dictionary<string, object>
+				{
+					["Name"] = "First Product",
+					["Description"] = "First Description"
+				};
 				session.Save(
 					new Product
 					{
 						ProductId = "1",
-						Properties = new Dictionary<string, object>
-						{
-							["Name"] = "First Product",
-							["Description"] = "First Description"
-						}
+						Properties = properties1
 					});
 
+				var properties2 = new
+				{
+					Name = "Second Product",
+					Description = "Second Description"
+				};
 				session.Save(
 					new Product
 					{
 						ProductId = "2",
-						Properties = new Dictionary<string, object>
-						{
-							["Name"] = "Second Product",
-							["Description"] = "Second Description"
-						}
+						Properties = properties2
 					});
 
+				dynamic properties3 = new ExpandoObject();
+				properties3.Name = "Third Product";
+				properties3.Description = "Third Description";
 				session.Save(
 					new Product
 					{
 						ProductId = "3",
-						Properties = new Dictionary<string, object>
-						{
-							["Name"] = "val",
-							["Description"] = "val"
-						}
+						Properties = properties3
 					});
 
 				tran.Commit();
@@ -81,6 +83,7 @@ public void Query_DynamicComponent()
 
 				Assert.That(product, Is.Not.Null);
 				Assert.That((object) product.Properties["Name"], Is.EqualTo("First Product"));
+				Assert.That((object) product.Properties.Name, Is.EqualTo("First Product"));
 			}
 		}
 
@@ -100,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/NHibernate.csproj

@@ -49,6 +49,7 @@
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Configuration" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
@@ -63,6 +64,7 @@
     <PackageReference Include="System.Security.Permissions" Version="4.4.1" />
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
   </ItemGroup>
 
   <ItemGroup>

src/NHibernate/Properties/MapAccessor.cs

@@ -1,14 +1,18 @@
+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 System;
+using Binder = Microsoft.CSharp.RuntimeBinder.Binder;
+
 namespace NHibernate.Properties
 {
 	[Serializable]
 	public class MapAccessor : IPropertyAccessor
 	{
-		#region IPropertyAccessor Members
-
 		public IGetter GetGetter(System.Type theClass, string propertyName)
 		{
 			return new MapGetter(propertyName);
@@ -19,70 +23,100 @@ public ISetter GetSetter(System.Type theClass, string propertyName)
 			return new MapSetter(propertyName);
 		}
 
-		public bool CanAccessThroughReflectionOptimizer
-		{
-			get { return false; }
-		}
+		public bool CanAccessThroughReflectionOptimizer => false;
 
-		#endregion
 		[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 readonly string name;
 
 			internal MapSetter(string name)
 			{
 				this.name = name;
 			}
 
-			public MethodInfo Method
-			{
-				get { return null; }
-			}
+			public MethodInfo Method => null;
 
-			public string PropertyName
-			{
-				get { return null; }
-			}
+			public string PropertyName => null;
 
 			public void Set(object target, object value)
 			{
-				((IDictionary)target)[name] = value;
+				switch (target)
+				{
+					case IDictionary d:
+						d[name] = value;
+						break;
+					case IDictionary<string, object> d:
+						d[name] = value;
+						break;
+					default:
+						var site = SetMemberSites.GetOrAdd(
+							System.Tuple.Create(target.GetType(), name),
+							t => CallSite<Func<CallSite, object, object, object>>.Create(
+								Binder.GetMember(
+									CSharpBinderFlags.None,
+									t.Item2,
+									t.Item1,
+									new[]
+									{
+										CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null),
+										CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null)
+									})));
+
+						site.Target(site, target, value);
+						break;
+				}
 			}
 		}
+
 		[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 readonly string name;
 
 			internal MapGetter(string name)
 			{
 				this.name = name;
 			}
 
-			public MethodInfo Method
-			{
-				get { return null; }
-			}
+			public MethodInfo Method => null;
 
-			public object GetForInsert(object owner, IDictionary mergeMap, ISessionImplementor session)
-			{
-				return Get(owner);
-			}
+			public string PropertyName => null;
 
-			public string PropertyName
-			{
-				get { return null; }
-			}
+			public System.Type ReturnType => typeof(object);
 
-			public System.Type ReturnType
+			public object GetForInsert(object owner, IDictionary mergeMap, ISessionImplementor session)
 			{
-				get { return typeof(object); }
+				return Get(owner);
 			}
 
 			public object Get(object target)
 			{
-				return ((IDictionary)target)[name];
+				switch (target)
+				{
+					case IDictionary d:
+						return d[name];
+					case IDictionary<string, object> d:
+						d.TryGetValue(name, out var result);
+						return result;
+					default:
+						var site = GetMemberSites.GetOrAdd(
+							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);
+				}
 			}
 		}
 	}

src/NHibernate/Tuple/Component/DynamicComponentInstantiator.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using NHibernate.Util;
 
 namespace NHibernate.Tuple.Component
 {
@@ -8,8 +10,10 @@ internal class DynamicComponentInstantiator : IInstantiator
 	{
 		public object Instantiate(object id) => Instantiate();
 
-		public object Instantiate() => new Dictionary<string, object>();
+		public object Instantiate() => new DynamicComponent();
 
-		public bool IsInstance(object obj) => obj is Dictionary<string, object>;
+		public bool IsInstance(object obj) => obj is DynamicComponent ||
+		                                      obj is IDictionary<string, object> ||
+		                                      obj is IDictionary;
 	}
 }