Merge branch 'rjperes-NH-2930'

Author: hazzik

src/NHibernate.Test/MappingByCode/ExplicitMappingTests/BasicMappingOfSimpleClass.cs

@@ -6,7 +6,7 @@
 using NHibernate.Mapping.ByCode;
 using NUnit.Framework;
 
-namespace NHibernate.Test.MappingByCode.ExpliticMappingTests
+namespace NHibernate.Test.MappingByCode.ExplicitMappingTests
 {
 	public class BasicMappingOfSimpleClass
 	{
@@ -16,6 +16,25 @@ public class MyClass
 			public string Something { get; set; }
 		}
 
+		[Test]
+		public void AbstractClass()
+		{
+			//NH-3527
+			var mapper = new ModelMapper();
+			mapper.Class<MyClass>(ca =>
+			{
+				ca.Abstract(true);
+				ca.Id(x => x.Id, map =>
+				{
+					map.Column("MyClassId");
+					map.Generator(Generators.HighLow, gmap => gmap.Params(new { max_low = 100 }));
+				});
+				ca.Property(x => x.Something, map => map.Length(150));
+			});
+			var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+			Assert.AreEqual(hbmMapping.RootClasses[0].@abstract, true);
+		}
+
 		[Test]
 		public void MapClassWithIdAndProperty()
 		{

src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/JoinedSubclassMappingStrategyTests.cs

@@ -79,5 +79,23 @@ public void WhenRegisteredAsJoinedSubclassThenIsEntity()
 
 			Assert.That(inspector.IsEntity(typeof(Inherited1)), Is.True);
 		}
+
+		[Test]
+		public void JoinedSubclassIsAbstract()
+		{
+			//NH-3527
+			var modelMapper = new ModelMapper();
+			modelMapper.Class<MyClass>(c => { });
+			modelMapper.JoinedSubclass<Inherited1>(c =>
+			{
+				c.Abstract(true);
+				c.Extends(typeof(MyClass));
+			});
+
+			var mappings = modelMapper.CompileMappingForAllExplicitlyAddedEntities();
+
+			Assert.IsTrue(mappings.JoinedSubclasses[0].@abstract);
+			Assert.IsTrue(mappings.JoinedSubclasses[0].extends == typeof(MyClass).FullName);
+		}
 	}
 }

src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/SubclassMappingStrategyTests.cs

@@ -79,5 +79,23 @@ public void WhenRegisteredAsSubclassThenIsEntity()
 
 			Assert.That(inspector.IsEntity(typeof(Inherited1)), Is.True);
 		}
+
+		[Test]
+		public void SubclassIsAbstract()
+		{
+			//NH-3527
+			var modelMapper = new ModelMapper();
+			modelMapper.Class<MyClass>(c => { });
+			modelMapper.Subclass<Inherited1>(c =>
+			{
+				c.Abstract(true);
+				c.Extends(typeof(MyClass));
+			});
+
+			var mappings = modelMapper.CompileMappingForAllExplicitlyAddedEntities();
+
+			Assert.IsTrue(mappings.SubClasses[0].@abstract);
+			Assert.IsTrue(mappings.SubClasses[0].extends == typeof(MyClass).FullName);
+		}
 	}
 }

src/NHibernate.Test/MappingByCode/ExplicitlyDeclaredModelTests/UnionSubclassMappingStrategyTests.cs

@@ -79,5 +79,23 @@ public void WhenRegisteredAsUnionSubclassThenIsEntity()
 
 			Assert.That(inspector.IsEntity(typeof(Inherited1)), Is.True);
 		}
+
+		[Test]
+		public void UnionSubclassIsAbstract()
+		{
+			//NH-3527
+			var modelMapper = new ModelMapper();
+			modelMapper.Class<MyClass>(c => { });
+			modelMapper.UnionSubclass<Inherited1>(c =>
+				{
+					c.Abstract(true);
+					c.Extends(typeof(MyClass));
+				});
+
+			var mappings = modelMapper.CompileMappingForAllExplicitlyAddedEntities();
+
+			Assert.IsTrue(mappings.UnionSubclasses[0].@abstract);
+			Assert.IsTrue(mappings.UnionSubclasses[0].extends == typeof(MyClass).FullName);
+		}
 	}
 }

src/NHibernate/Mapping/ByCode/IClassMapper.cs

@@ -13,6 +13,7 @@ public interface IClassAttributesMapper : IEntityAttributesMapper, IEntitySqlsMa
 		void ComponentAsId(MemberInfo idProperty, Action<IComponentAsIdMapper> idMapper);
 		void ComposedId(Action<IComposedIdMapper> idPropertiesMapping);
 
+		void Abstract(bool isAbstract);
 		void Discriminator(Action<IDiscriminatorMapper> discriminatorMapping);
 		void DiscriminatorValue(object value);
 		void Table(string tableName);
@@ -53,6 +54,7 @@ public interface IClassAttributesMapper<TEntity> : IEntityAttributesMapper, IEnt
 
 		void ComposedId(Action<IComposedIdMapper<TEntity>> idPropertiesMapping);
 
+		void Abstract(bool isAbstract);
 		void Discriminator(Action<IDiscriminatorMapper> discriminatorMapping);
 		void DiscriminatorValue(object value);
 		void Table(string tableName);

src/NHibernate/Mapping/ByCode/IJoinedSubclassMapper.cs

@@ -10,13 +10,16 @@ public interface IJoinedSubclassAttributesMapper : IEntityAttributesMapper, IEnt
 		void Key(Action<IKeyMapper> keyMapping);
 		void Extends(System.Type baseType);
 		void SchemaAction(SchemaAction action);
-        void Filter(string filterName, Action<IFilterMapper> filterMapping);
+		void Filter(string filterName, Action<IFilterMapper> filterMapping);
+		void Abstract(bool isAbstract);
 	}
 
 	public interface IJoinedSubclassMapper : IJoinedSubclassAttributesMapper, IPropertyContainerMapper {}
 
 	public interface IJoinedSubclassAttributesMapper<TEntity> : IEntityAttributesMapper, IEntitySqlsMapper where TEntity : class
 	{
+		void Abstract(bool isAbstract);
+		void Extends(System.Type baseType);
 		void Table(string tableName);
 		void Catalog(string catalogName);
 		void Schema(string schemaName);

src/NHibernate/Mapping/ByCode/ISubclassMapper.cs

@@ -7,6 +7,7 @@ public interface ISubclassAttributesMapper : IEntityAttributesMapper, IEntitySql
 		void DiscriminatorValue(object value);
 		void Extends(System.Type baseType);
 		void Filter(string filterName, Action<IFilterMapper> filterMapping);
+		void Abstract(bool isAbstract);
 	}
 
 	public interface ISubclassMapper : ISubclassAttributesMapper, IPropertyContainerMapper
@@ -18,6 +19,8 @@ public interface ISubclassAttributesMapper<TEntity> : IEntityAttributesMapper, I
 	{
 		void DiscriminatorValue(object value);
 		void Filter(string filterName, Action<IFilterMapper> filterMapping);
+		void Extends(System.Type baseType);
+		void Abstract(bool isAbstract);
 	}
 
 	public interface ISubclassMapper<TEntity> : ISubclassAttributesMapper<TEntity>, IPropertyContainerMapper<TEntity> where TEntity : class

src/NHibernate/Mapping/ByCode/IUnionSubclassMapper.cs

@@ -6,6 +6,7 @@ public interface IUnionSubclassAttributesMapper : IEntityAttributesMapper, IEnti
 		void Catalog(string catalogName);
 		void Schema(string schemaName);
 		void Extends(System.Type baseType);
+		void Abstract(bool isAbstract);
 	}
 
 	public interface IUnionSubclassMapper : IUnionSubclassAttributesMapper, IPropertyContainerMapper {}
@@ -15,6 +16,8 @@ public interface IUnionSubclassAttributesMapper<TEntity> : IEntityAttributesMapp
 		void Table(string tableName);
 		void Catalog(string catalogName);
 		void Schema(string schemaName);
+		void Extends(System.Type baseType);
+		void Abstract(bool isAbstract);
 	}
 
 	public interface IUnionSubclassMapper<TEntity> : IUnionSubclassAttributesMapper<TEntity>, IPropertyContainerMapper<TEntity> where TEntity : class {}

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

@@ -59,6 +59,12 @@ public Dictionary<string, IJoinMapper> JoinMappers
 		}
 
 		#region Implementation of IClassMapper
+		public void Abstract(bool isAbstract)
+		{
+			classMapping.@abstract = isAbstract;
+			classMapping.abstractSpecified = true;
+		}
+
 		public void OptimisticLock(OptimisticLockMode mode)
 		{
 			classMapping.optimisticlock = (HbmOptimisticLockMode)Enum.Parse(typeof(OptimisticLockMode), mode.ToString());

src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ClassCustomizer.cs

@@ -29,6 +29,10 @@ private Dictionary<string, IJoinMapper<TEntity>> JoinCustomizers
 		}
 
 		#region Implementation of IClassAttributesMapper<TEntity>
+		public void Abstract(bool isAbstract)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Abstract(isAbstract));
+		}
 
 		public void OptimisticLock(OptimisticLockMode mode)
 		{