nhibernate-commit Mailing List for NHibernate (Page 17)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5653
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5653&view=rev
Author:   fabiomaulo
Date:     2011-04-10 18:32:35 +0000 (Sun, 10 Apr 2011)

Log Message:
-----------
SimpleModelInspector with default pattern to discover Components

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/ComponentsTests.cs

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs
===================================================================

--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs	2011-04-10 18:15:26 UTC (rev 5652)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs	2011-04-10 18:32:35 UTC (rev 5653)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 
 namespace NHibernate.Mapping.ByCode
@@ -18,7 +19,7 @@
 		private Func<System.Type, bool, bool> isTablePerClassHierarchy = (t, declared) => declared;
 		private Func<System.Type, bool, bool> isTablePerConcreteClass = (t, declared) => declared;
 		private Func<System.Type, IEnumerable<string>, IEnumerable<string>> splitsForType = (t, declared) => declared;
-		private Func<System.Type, bool, bool> isComponent = (t, declared) => declared;
+		private Func<System.Type, bool, bool> isComponent;
 
 		private Func<MemberInfo, bool, bool> isPersistentId;
 		private Func<MemberInfo, bool, bool> isPersistentProperty = (m, declared) => declared;
@@ -42,6 +43,7 @@
 		public SimpleModelInspector()
 		{
 			isPersistentId = (m, declared) => declared || MatchPoIdPattern(m);
+			isComponent = (t, declared) => declared || MatchComponentPattern(t);
 		}
 
 		protected bool MatchPoIdPattern(MemberInfo subject)
@@ -53,6 +55,18 @@
 						 || (name.StartsWith(subject.DeclaringType.Name) && name.Equals(subject.DeclaringType.Name + "id", StringComparison.InvariantCultureIgnoreCase));
 		}
 
+		protected bool MatchComponentPattern(System.Type subject)
+		{
+			const BindingFlags flattenHierarchyMembers =
+				BindingFlags.FlattenHierarchy | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
+
+			var modelInspector = (IModelInspector) this;
+			return !subject.IsEnum && !subject.Namespace.StartsWith("System") /* hack */&& !modelInspector.IsEntity(subject)
+			       &&
+			       !subject.GetProperties(flattenHierarchyMembers).Cast<MemberInfo>().Concat(
+			       	subject.GetFields(flattenHierarchyMembers)).Any(m => modelInspector.IsPersistentId(m));
+		}
+
 		#region IModelExplicitDeclarationsHolder Members
 
 		IEnumerable<System.Type> IModelExplicitDeclarationsHolder.RootEntities

Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/ComponentsTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/ComponentsTests.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MixAutomapping/ComponentsTests.cs	2011-04-10 18:32:35 UTC (rev 5653)
@@ -0,0 +1,79 @@
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.MixAutomapping
+{
+	public class ComponentsTests
+	{
+		// a class without Poid is a Component
+		private class AComponent
+		{
+			public string S { get; set; }
+		}
+		private class AEntity
+		{
+			public int Id { get; set; }
+		}
+		private class Entity
+		{
+			private int id;
+		}
+
+		private enum Something
+		{
+
+		}
+
+		[Test]
+		public void WhenAClassIsExplicitlyDeclaredAsComponentThenIsComponent()
+		{
+			var autoinspector = new SimpleModelInspector();
+			var mapper = new ModelMapper(autoinspector);
+			mapper.Component<AEntity>(map => { });
+
+			var inspector = (IModelInspector)autoinspector;
+			inspector.IsComponent(typeof(AEntity)).Should().Be.True();
+		}
+
+		[Test]
+		public void ClassWithoutPoidIsComponent()
+		{
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+			inspector.IsComponent(typeof(AComponent)).Should().Be.True();
+		}
+
+		[Test]
+		public void ClassWithPoidIsNotComponent()
+		{
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+			inspector.IsComponent(typeof(AEntity)).Should().Be.False();
+		}
+
+		[Test]
+		public void ClassWithPoidFieldIsNotComponent()
+		{
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+			inspector.IsComponent(typeof(Entity)).Should().Be.False();
+		}
+
+		[Test]
+		public void EnumIsNotComponent()
+		{
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+			inspector.IsComponent(typeof(Something)).Should().Be.False();
+		}
+
+		[Test]
+		public void StringIsNotComponent()
+		{
+			var autoinspector = new SimpleModelInspector();
+			var inspector = (IModelInspector)autoinspector;
+			inspector.IsComponent(typeof(string)).Should().Be.False();
+		}
+	}
+}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-10 18:15:26 UTC (rev 5652)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-10 18:32:35 UTC (rev 5653)
@@ -541,6 +541,7 @@
     <Compile Include="MappingByCode\MappersTests\IdBagMapperTest.cs" />
     <Compile Include="MappingByCode\MappersTests\JoinMapperTests.cs" />
     <Compile Include="MappingByCode\MappersTests\SubclassMapperWithJoinPropertiesTest.cs" />
+    <Compile Include="MappingByCode\MixAutomapping\ComponentsTests.cs" />
     <Compile Include="MappingByCode\MixAutomapping\PoidTests.cs" />
     <Compile Include="MappingByCode\ModelExplicitDeclarationsHolderMergeTest.cs" />
     <Compile Include="MappingByCode\NatureDemo\Naturalness\Address.cs" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2004	Jan	Feb	Mar	Apr (248)	May (82)	Jun (90)	Jul (177)	Aug (253)	Sep (157)	Oct (151)	Nov (143)	Dec (278)
2005	Jan (152)	Feb (107)	Mar (177)	Apr (133)	May (259)	Jun (81)	Jul (119)	Aug (306)	Sep (416)	Oct (240)	Nov (329)	Dec (206)
2006	Jan (466)	Feb (382)	Mar (153)	Apr (162)	May (133)	Jun (21)	Jul (18)	Aug (37)	Sep (97)	Oct (114)	Nov (110)	Dec (28)
2007	Jan (74)	Feb (65)	Mar (49)	Apr (76)	May (43)	Jun (15)	Jul (68)	Aug (55)	Sep (63)	Oct (59)	Nov (70)	Dec (66)
2008	Jan (71)	Feb (60)	Mar (120)	Apr (31)	May (48)	Jun (81)	Jul (107)	Aug (51)	Sep (80)	Oct (83)	Nov (83)	Dec (79)
2009	Jan (83)	Feb (110)	Mar (97)	Apr (91)	May (291)	Jun (250)	Jul (197)	Aug (58)	Sep (54)	Oct (122)	Nov (68)	Dec (34)
2010	Jan (50)	Feb (17)	Mar (63)	Apr (61)	May (84)	Jun (81)	Jul (138)	Aug (144)	Sep (78)	Oct (26)	Nov (30)	Dec (61)
2011	Jan (33)	Feb (35)	Mar (166)	Apr (221)	May (109)	Jun (76)	Jul (27)	Aug (37)	Sep (1)	Oct (4)	Nov (2)	Dec (1)
2012	Jan	Feb	Mar (2)	Apr (2)	May	Jun	Jul (1)	Aug	Sep (1)	Oct	Nov (1)	Dec
2013	Jan	Feb (1)	Mar	Apr	May	Jun	Jul (1)	Aug (1)	Sep (3)	Oct (2)	Nov	Dec (1)
2014	Jan (1)	Feb (1)	Mar (3)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

nhibernate-commit Mailing List for NHibernate (Page 17)

nhibernate-commit — CVS Commits