Class Customizers with mapping of not visible id/version

SVN: trunk@5791

Author: fabiomaulo

src/NHibernate.Test/MappingByCode/ExpliticMappingTests/MappingOfPrivateMembersOnRootEntity.cs

@@ -11,6 +11,7 @@ public class MappingOfPrivateMembersOnRootEntity
 		public class MyClass
 		{
 			private int id;
+			private int version;
 			private string something;
 		}
 
@@ -20,11 +21,12 @@ public void MapClassWithIdAndProperty()
 			var mapper = new ModelMapper();
 			mapper.Class<MyClass>(ca =>
 			{
-				ca.Id(ForClass<MyClass>.Field("id"), map =>
+				ca.Id("id", map =>
 				{
 					map.Column("MyClassId");
 					map.Generator(Generators.HighLow, gmap => gmap.Params(new { max_low = 100 }));
 				});
+				ca.Version("version", map => { });
 				ca.Property("something", map => map.Length(150));
 			});
 			var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
@@ -39,6 +41,8 @@ public void MapClassWithIdAndProperty()
 			hbmGenerator.@class.Should().Be("hilo");
 			hbmGenerator.param[0].name.Should().Be("max_low");
 			hbmGenerator.param[0].GetText().Should().Be("100");
+			var hbmVersion = hbmClass.Version;
+			hbmVersion.name.Should().Be("version");
 			var hbmProperty = hbmClass.Properties.OfType<HbmProperty>().Single();
 			hbmProperty.name.Should().Be("something");
 			hbmProperty.access.Should().Be("field");

src/NHibernate/Mapping/ByCode/IClassMapper.cs

@@ -40,10 +40,12 @@ public interface IClassAttributesMapper<TEntity> : IEntityAttributesMapper, IEnt
 	{
 		void Id<TProperty>(Expression<Func<TEntity, TProperty>> idProperty);
 		void Id<TProperty>(Expression<Func<TEntity, TProperty>> idProperty, Action<IIdMapper> idMapper);
-		void Id(FieldInfo idProperty, Action<IIdMapper> idMapper);
+		void Id(string notVidiblePropertyOrFieldName, Action<IIdMapper> idMapper);
 
 		void ComponentAsId<TComponent>(Expression<Func<TEntity, TComponent>> idProperty) where TComponent : class;
 		void ComponentAsId<TComponent>(Expression<Func<TEntity, TComponent>> idProperty, Action<IComponentAsIdMapper<TComponent>> idMapper) where TComponent : class;
+		void ComponentAsId<TComponent>(string notVidiblePropertyOrFieldName) where TComponent : class;
+		void ComponentAsId<TComponent>(string notVidiblePropertyOrFieldName, Action<IComponentAsIdMapper<TComponent>> idMapper) where TComponent : class;
 
 		void ComposedId(Action<IComposedIdMapper<TEntity>> idPropertiesMapping);
 
@@ -54,6 +56,7 @@ public interface IClassAttributesMapper<TEntity> : IEntityAttributesMapper, IEnt
 		void Schema(string schemaName);
 		void Mutable(bool isMutable);
 		void Version<TProperty>(Expression<Func<TEntity, TProperty>> versionProperty, Action<IVersionMapper> versionMapping);
+		void Version(string notVidiblePropertyOrFieldName, Action<IVersionMapper> versionMapping);
 		void NaturalId(Action<IBasePlainPropertyContainerMapper<TEntity>> naturalIdPropertiesMapping, Action<INaturalIdAttributesMapper> naturalIdMapping);
 		void NaturalId(Action<IBasePlainPropertyContainerMapper<TEntity>> naturalIdPropertiesMapping);
 		void Cache(Action<ICacheMapper> cacheMapping);

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

@@ -43,13 +43,15 @@ public void Id<TProperty>(Expression<Func<TEntity, TProperty>> idProperty, Actio
 			CustomizersHolder.AddCustomizer(typeof (TEntity), m => m.Id(member, idMapper));
 		}
 
-		public void Id(FieldInfo idProperty, Action<IIdMapper> idMapper)
+		public void Id(string notVidiblePropertyOrFieldName, Action<IIdMapper> idMapper)
 		{
-			if (idProperty != null)
+			MemberInfo member = null;
+			if (notVidiblePropertyOrFieldName != null)
 			{
-				ExplicitDeclarationsHolder.AddAsPoid(idProperty);
+				member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+				ExplicitDeclarationsHolder.AddAsPoid(member);
 			}
-			CustomizersHolder.AddCustomizer(typeof(TEntity), m => m.Id(idProperty, idMapper));
+			CustomizersHolder.AddCustomizer(typeof(TEntity), m => m.Id(member, idMapper));
 		}
 
 		public void ComponentAsId<TComponent>(Expression<Func<TEntity, TComponent>> idProperty) where TComponent : class
@@ -64,6 +66,18 @@ public void ComponentAsId<TComponent>(Expression<Func<TEntity, TComponent>> idPr
 			idMapper(new ComponentAsIdCustomizer<TComponent>(ExplicitDeclarationsHolder, CustomizersHolder, propertyPath));
 		}
 
+		public void ComponentAsId<TComponent>(string notVidiblePropertyOrFieldName) where TComponent : class
+		{
+			ComponentAsId<TComponent>(notVidiblePropertyOrFieldName, x => { });
+		}
+
+		public void ComponentAsId<TComponent>(string notVidiblePropertyOrFieldName, Action<IComponentAsIdMapper<TComponent>> idMapper) where TComponent : class
+		{
+			var member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+			var propertyPath = new PropertyPath(null, member);
+			idMapper(new ComponentAsIdCustomizer<TComponent>(ExplicitDeclarationsHolder, CustomizersHolder, propertyPath));
+		}
+
 		public void ComposedId(Action<IComposedIdMapper<TEntity>> idPropertiesMapping)
 		{
 			idPropertiesMapping(new ComposedIdCustomizer<TEntity>(ExplicitDeclarationsHolder, CustomizersHolder));
@@ -110,6 +124,13 @@ public void Version<TProperty>(Expression<Func<TEntity, TProperty>> versionPrope
 			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Version(member, versionMapping));
 		}
 
+		public void Version(string notVidiblePropertyOrFieldName, Action<IVersionMapper> versionMapping)
+		{
+			var member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+			ExplicitDeclarationsHolder.AddAsVersionProperty(member);
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Version(member, versionMapping));
+		}
+
 		public void NaturalId(Action<IBasePlainPropertyContainerMapper<TEntity>> naturalIdPropertiesMapping, Action<INaturalIdAttributesMapper> naturalIdMapping)
 		{
 			naturalIdPropertiesMapping(new NaturalIdCustomizer<TEntity>(ExplicitDeclarationsHolder, CustomizersHolder));