Support ICompositeUserType for ByCode Element, KeyProperty, MapKey

Fix nhibernate#1821

Author: fredericDelaporte

src/NHibernate.Test/MappingByCode/MappersTests/ElementMapperTest.cs

@@ -0,0 +1,21 @@
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode.Impl;
+using NUnit.Framework;
+
+namespace NHibernate.Test.MappingByCode.MappersTests
+{
+	[TestFixture]
+	public class ElementMapperTest
+	{
+		[Test]
+		public void WhenSetTypeByICompositeUserTypeThenSetTypeName()
+		{
+			var mapping = new HbmElement();
+			var mapper = new ElementMapper(typeof(object), mapping);
+
+			Assert.That(() => mapper.Type<MyCompoType>(), Throws.Nothing);
+			Assert.That(mapping.Type.name, Does.Contain(nameof(MyCompoType)));
+			Assert.That(mapping.type, Is.Null);
+		}
+	}
+}

src/NHibernate.Test/MappingByCode/MappersTests/KeyPropertyMapperTest.cs

@@ -0,0 +1,27 @@
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode.Impl;
+using NUnit.Framework;
+
+namespace NHibernate.Test.MappingByCode.MappersTests
+{
+	[TestFixture]
+	public class KeyPropertyMapperTest
+	{
+		private class MyClass
+		{
+			public string ReadOnly { get { return ""; } }
+		}
+
+		[Test]
+		public void WhenSetTypeByICompositeUserTypeThenSetTypeName()
+		{
+			var member = typeof(MyClass).GetProperty("ReadOnly");
+			var mapping = new HbmKeyProperty();
+			var mapper = new KeyPropertyMapper(member, mapping);
+
+			Assert.That(() => mapper.Type<MyCompoType>(), Throws.Nothing);
+			Assert.That(mapping.Type.name, Does.Contain(nameof(MyCompoType)));
+			Assert.That(mapping.type, Is.Null);
+		}
+	}
+}

src/NHibernate.Test/MappingByCode/MappersTests/MapKeyMapperTest.cs

@@ -0,0 +1,20 @@
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode.Impl;
+using NUnit.Framework;
+
+namespace NHibernate.Test.MappingByCode.MappersTests
+{
+	[TestFixture]
+	public class MapKeyMapperTest
+	{
+		[Test]
+		public void WhenSetTypeByICompositeUserTypeThenSetTypeName()
+		{
+			var mapping = new HbmMapKey();
+			var mapper = new MapKeyMapper(mapping);
+
+			Assert.That(() => mapper.Type<MyCompoType>(), Throws.Nothing);
+			Assert.That(mapping.Type.name, Does.Contain(nameof(MyCompoType)));
+		}
+	}
+}

src/NHibernate/Mapping/ByCode/Impl/ElementMapper.cs

@@ -133,10 +133,16 @@ public void Type(System.Type persistentType, object parameters)
 			{
 				throw new ArgumentNullException("persistentType");
 			}
-			if (!typeof (IUserType).IsAssignableFrom(persistentType) && !typeof (IType).IsAssignableFrom(persistentType))
+
+			if (!typeof(IUserType).IsAssignableFrom(persistentType) &&
+				!typeof(IType).IsAssignableFrom(persistentType) &&
+				!typeof(ICompositeUserType).IsAssignableFrom(persistentType))
 			{
-				throw new ArgumentOutOfRangeException("persistentType", "Expected type implementing IUserType or IType.");
+				throw new ArgumentOutOfRangeException(
+					nameof(persistentType),
+					"Expected type implementing IUserType, ICompositeUserType or IType.");
 			}
+
 			if (parameters != null)
 			{
 				elementMapping.type1 = null;
@@ -206,4 +212,4 @@ public void Formula(string formula)
 
 		#endregion
 	}
-}
+}

src/NHibernate/Mapping/ByCode/Impl/KeyPropertyMapper.cs

@@ -86,10 +86,16 @@ public void Type(System.Type persistentType, object parameters)
 			{
 				throw new ArgumentNullException("persistentType");
 			}
-			if (!typeof (IUserType).IsAssignableFrom(persistentType) && !typeof (IType).IsAssignableFrom(persistentType))
+
+			if (!typeof(IUserType).IsAssignableFrom(persistentType) &&
+				!typeof(IType).IsAssignableFrom(persistentType) &&
+				!typeof(ICompositeUserType).IsAssignableFrom(persistentType))
 			{
-				throw new ArgumentOutOfRangeException("persistentType", "Expected type implementing IUserType or IType.");
+				throw new ArgumentOutOfRangeException(
+					nameof(persistentType),
+					"Expected type implementing IUserType, ICompositeUserType or IType.");
 			}
+
 			if (parameters != null)
 			{
 				propertyMapping.type1 = null;
@@ -235,4 +241,4 @@ private void ResetColumnPlainValues()
 
 		#endregion
 	}
-}
+}

src/NHibernate/Mapping/ByCode/Impl/MapKeyMapper.cs

@@ -92,10 +92,16 @@ public void Type(System.Type persistentType)
 			{
 				throw new ArgumentNullException("persistentType");
 			}
-			if (!typeof (IUserType).IsAssignableFrom(persistentType) && !typeof (IType).IsAssignableFrom(persistentType))
+
+			if (!typeof(IUserType).IsAssignableFrom(persistentType) &&
+				!typeof(IType).IsAssignableFrom(persistentType) &&
+				!typeof(ICompositeUserType).IsAssignableFrom(persistentType))
 			{
-				throw new ArgumentOutOfRangeException("persistentType", "Expected type implementing IUserType or IType.");
+				throw new ArgumentOutOfRangeException(
+					nameof(persistentType),
+					"Expected type implementing IUserType, ICompositeUserType or IType.");
 			}
+
 			hbmMapKey.type = persistentType.AssemblyQualifiedName;
 		}
 
@@ -140,4 +146,4 @@ private bool ColumnTagIsRequired(HbmColumn hbm)
 			       || hbm.check != null;
 		}
 	}
-}
+}