by-code : Breaking change with Alpha2 to map private/protected members

SVN: trunk@5789

Author: fabiomaulo

src/NHibernate.Test/MappingByCode/ConventionModelMapperTests/PropertyToFieldAccessorTest.cs

@@ -50,9 +50,8 @@ public int SetOnlyProperty
 		[Test]
 		public void WhenFieldAccessToField()
 		{
-			var member = typeof(MyClass).GetField("aField",BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly);
 			var mapper = new ConventionModelMapper();
-			mapper.Class<MyClass>(mc => mc.Property(member, x => { }));
+			mapper.Class<MyClass>(mc => mc.Property("aField", x => { }));
 			var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
 
 			var hbmClass = hbmMapping.RootClasses[0];

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

@@ -25,7 +25,7 @@ public void MapClassWithIdAndProperty()
 					map.Column("MyClassId");
 					map.Generator(Generators.HighLow, gmap => gmap.Params(new { max_low = 100 }));
 				});
-				ca.Property(ForClass<MyClass>.Field("something"), map => map.Length(150));
+				ca.Property("something", map => map.Length(150));
 			});
 			var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
 			var hbmClass = hbmMapping.RootClasses[0];

src/NHibernate.Test/MappingByCode/MixAutomapping/PropertiesExclusionTests.cs

@@ -84,7 +84,7 @@ public void IncludesFieldsWhenExplicitDeclared()
 		{
 			var autoinspector = new SimpleModelInspector();
 			var mapper = new ModelMapper(autoinspector);
-			mapper.Class<MyEntity>(map => map.Property(ForClass<MyEntity>.Field("pizza"), x => { }));
+			mapper.Class<MyEntity>(map => map.Property("pizza", x => { }));
 			var inspector = (IModelInspector)autoinspector;
 
 			var pi = typeof(MyEntity).GetField("pizza", BindingFlags.Instance | BindingFlags.NonPublic);

src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs

@@ -28,7 +28,7 @@ public interface IMinimalPlainPropertyContainerMapper<TContainer>
 	{
 		void Property<TProperty>(Expression<Func<TContainer, TProperty>> property);
 		void Property<TProperty>(Expression<Func<TContainer, TProperty>> property, Action<IPropertyMapper> mapping);
-		void Property(FieldInfo member, Action<IPropertyMapper> mapping);
+		void Property(string notVidiblePropertyOrFieldName, Action<IPropertyMapper> mapping);
 
 		void ManyToOne<TProperty>(Expression<Func<TContainer, TProperty>> property, Action<IManyToOneMapper> mapping) where TProperty : class;
 		void ManyToOne<TProperty>(Expression<Func<TContainer, TProperty>> property) where TProperty : class;

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

@@ -117,10 +117,12 @@ protected override void RegisterPropertyMapping<TProperty>(Expression<Func<TEnti
 			base.RegisterPropertyMapping(property, mapping);
 		}
 
-		protected override void RegisterFieldMapping(FieldInfo member, Action<IPropertyMapper> mapping)
+		protected override void RegisterNoVisiblePropertyMapping(string notVidiblePropertyOrFieldName, System.Action<IPropertyMapper> mapping)
 		{
+			MemberInfo member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+
 			ExplicitDeclarationsHolder.AddAsPropertySplit(new SplitDefinition(typeof(TEntity), splitGroupId, member));
-			base.RegisterFieldMapping(member, mapping);
+			base.RegisterNoVisiblePropertyMapping(notVidiblePropertyOrFieldName, mapping);
 		}
 
 		protected override void RegisterComponentMapping<TComponent>(Expression<Func<TEntity, TComponent>> property, Action<IComponentMapper<TComponent>> mapping)

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

@@ -16,10 +16,14 @@ protected override void RegisterPropertyMapping<TProperty>(System.Linq.Expressio
 			base.RegisterPropertyMapping(property, mapping);
 		}
 
-		protected override void RegisterFieldMapping(FieldInfo member, System.Action<IPropertyMapper> mapping)
+		protected override void RegisterNoVisiblePropertyMapping(string notVidiblePropertyOrFieldName, System.Action<IPropertyMapper> mapping)
 		{
+			MemberInfo member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+			MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
+
 			ExplicitDeclarationsHolder.AddAsNaturalId(member);
-			base.RegisterFieldMapping(member, mapping);
+			ExplicitDeclarationsHolder.AddAsNaturalId(memberOf);
+			base.RegisterNoVisiblePropertyMapping(notVidiblePropertyOrFieldName, mapping);
 		}
 
 		protected override void RegisterComponentMapping<TComponent>(System.Linq.Expressions.Expression<System.Func<TEntity, TComponent>> property, System.Action<IComponentMapper<TComponent>> mapping)

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

@@ -49,15 +49,21 @@ protected virtual void RegisterPropertyMapping<TProperty>(Expression<Func<TEntit
 			explicitDeclarationsHolder.AddAsProperty(memberOf);
 		}
 
-		public void Property(FieldInfo member, Action<IPropertyMapper> mapping)
+		public void Property(string notVidiblePropertyOrFieldName, Action<IPropertyMapper> mapping)
 		{
-			RegisterFieldMapping(member, mapping);
+			RegisterNoVisiblePropertyMapping(notVidiblePropertyOrFieldName, mapping);
 		}
 
-		protected virtual void RegisterFieldMapping(FieldInfo member, Action<IPropertyMapper> mapping)
+		protected virtual void RegisterNoVisiblePropertyMapping(string notVidiblePropertyOrFieldName, Action<IPropertyMapper> mapping)
 		{
+			// even seems repetitive, before unify this registration with the registration using Expression take in account that reflection operations
+			// done unsing expressions are faster than those done with pure reflection.
+			MemberInfo member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+			MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
 			CustomizersHolder.AddCustomizer(new PropertyPath(PropertyPath, member), mapping);
+			CustomizersHolder.AddCustomizer(new PropertyPath(PropertyPath, memberOf), mapping);
 			explicitDeclarationsHolder.AddAsProperty(member);
+			explicitDeclarationsHolder.AddAsProperty(memberOf);
 		}
 
 		public void Component<TComponent>(Expression<Func<TEntity, TComponent>> property,