Full port of Tuple namespace.

SVN: trunk@3155

Author: fabiomaulo

src/NHibernate/Mapping/Component.cs

@@ -18,6 +18,7 @@ public class Component : SimpleValue
 		private bool dynamic;
 		private bool isKey;
 		private string roleName;
+		private Dictionary<EntityMode, string> tuplizerImpls;
 
 		/// <summary></summary>
 		public int PropertySpan
@@ -210,5 +211,40 @@ public Property GetProperty(string propertyName)
 			}
 			throw new MappingException("component property not found: " + propertyName);
 		}
+
+		public virtual void AddTuplizer(EntityMode entityMode, string implClassName)
+		{
+			if (tuplizerImpls == null)
+				tuplizerImpls = new Dictionary<EntityMode, string>();
+
+			tuplizerImpls[entityMode] = implClassName;
+		}
+
+		public virtual string GetTuplizerImplClassName(EntityMode mode)
+		{
+			// todo : remove this once ComponentMetamodel is complete and merged
+			if (tuplizerImpls == null)
+			{
+				return null;
+			}
+			return tuplizerImpls[mode];
+		}
+
+		public virtual IDictionary<EntityMode, string> TuplizerMap
+		{
+			get
+			{
+				if (tuplizerImpls == null)
+					return null;
+
+				return tuplizerImpls;
+			}
+		}
+
+		public bool HasPojoRepresentation
+		{
+			get { return componentClass != null; }
+		}
+
 	}
 }

src/NHibernate/Mapping/PersistentClass.cs

@@ -972,7 +972,12 @@ public virtual System.Type GetTuplizerImplClassName(EntityMode mode)
 
 				return new Dictionary<EntityMode, System.Type>(tuplizerImpls);
 			}
+		}
 
+		public bool HasPojoRepresentation
+		{
+			get { return MappedClass != null; }
 		}
+
 	}
 }

src/NHibernate/NHibernate-2.0.csproj

@@ -963,6 +963,7 @@
     <Compile Include="Transform\PassThroughResultTransformer.cs" />
     <Compile Include="Transform\Transformers.cs" />
     <Compile Include="Tuple\Component\AbstractComponentTuplizer.cs" />
+    <Compile Include="Tuple\Component\ComponentEntityModeToTuplizerMapping.cs" />
     <Compile Include="Tuple\Component\ComponentMetamodel.cs" />
     <Compile Include="Tuple\Component\DynamicMapComponentTuplizer.cs" />
     <Compile Include="Tuple\Component\IComponentTuplizer.cs" />

src/NHibernate/Tuple/Component/ComponentEntityModeToTuplizerMapping.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using NHibernate.Mapping;
+using NHibernate.Util;
+
+namespace NHibernate.Tuple.Component
+{
+	/// <summary> 
+	/// Handles mapping <see cref="EntityMode"/>s to <see cref="IComponentTuplizer">ComponentTuplizers</see>.
+	/// <p/>
+	/// Most of the handling is really in the super class; here we just create
+	/// the tuplizers and add them to the superclass
+	/// </summary>
+	[Serializable]
+	public class ComponentEntityModeToTuplizerMapping : EntityModeToTuplizerMapping
+	{
+		private static readonly System.Type[] componentTuplizerCTORSignature = new System.Type[] { typeof(Mapping.Component) };
+
+		public ComponentEntityModeToTuplizerMapping(Mapping.Component component)
+		{
+			PersistentClass owner = component.Owner;
+
+			// create our own copy of the user-supplied tuplizer impl map
+			Dictionary<EntityMode, string> userSuppliedTuplizerImpls;
+			if (component.TuplizerMap != null)
+				userSuppliedTuplizerImpls = new Dictionary<EntityMode, string>(component.TuplizerMap);
+			else
+				userSuppliedTuplizerImpls = new Dictionary<EntityMode, string>();
+
+
+			// Build the dynamic-map tuplizer...
+			ITuplizer dynamicMapTuplizer;
+			string tuplizerImpl;
+			if (!userSuppliedTuplizerImpls.TryGetValue(EntityMode.Map,out tuplizerImpl))
+			{
+				dynamicMapTuplizer = new DynamicMapComponentTuplizer(component);
+			}
+			else
+			{
+				dynamicMapTuplizer = BuildComponentTuplizer(tuplizerImpl, component);
+				userSuppliedTuplizerImpls.Remove(EntityMode.Map);
+			}
+
+			// then the pojo tuplizer, using the dynamic-map tuplizer if no pojo representation is available
+			ITuplizer pojoTuplizer;
+			string tempObject2;
+			userSuppliedTuplizerImpls.TryGetValue(EntityMode.Poco, out tempObject2);
+			userSuppliedTuplizerImpls.Remove(EntityMode.Poco);
+			tuplizerImpl = tempObject2;
+			if (owner.HasPojoRepresentation && component.HasPojoRepresentation)
+			{
+				if (tuplizerImpl == null)
+				{
+					pojoTuplizer = new PojoComponentTuplizer(component);
+				}
+				else
+				{
+					pojoTuplizer = BuildComponentTuplizer(tuplizerImpl, component);
+				}
+			}
+			else
+			{
+				pojoTuplizer = dynamicMapTuplizer;
+			}
+
+			// put the "standard" tuplizers into the tuplizer map first
+			if (pojoTuplizer != null)
+			{
+				AddTuplizer(EntityMode.Poco, pojoTuplizer);
+			}
+			if (dynamicMapTuplizer != null)
+			{
+				AddTuplizer(EntityMode.Map, dynamicMapTuplizer);
+			}
+
+			// then handle any user-defined entity modes..
+			foreach (KeyValuePair<EntityMode, string> entry in userSuppliedTuplizerImpls)
+			{
+				IComponentTuplizer tuplizer = BuildComponentTuplizer(entry.Value, component);
+				AddTuplizer(entry.Key, tuplizer);
+			}
+		}
+
+		private IComponentTuplizer BuildComponentTuplizer(string tuplizerImpl, Mapping.Component component)
+		{
+			try
+			{
+				System.Type implClass = ReflectHelper.ClassForName(tuplizerImpl);
+				return (IComponentTuplizer)implClass.GetConstructor(componentTuplizerCTORSignature).Invoke(new object[] { component });
+			}
+			catch (Exception t)
+			{
+				throw new HibernateException("Could not build tuplizer [" + tuplizerImpl + "]", t);
+			}
+		}
+	}
+}

src/NHibernate/Tuple/Component/ComponentMetamodel.cs

@@ -11,6 +11,7 @@ public class ComponentMetamodel
 		private readonly int propertySpan;
 		private readonly StandardProperty[] properties;
 		private readonly Dictionary<string, int> propertyIndexes;
+		private readonly ComponentEntityModeToTuplizerMapping tuplizerMapping;
 
 		public ComponentMetamodel(Mapping.Component component)
 		{
@@ -26,6 +27,7 @@ public ComponentMetamodel(Mapping.Component component)
 				propertyIndexes[property.Name] = i;
 				i++;
 			}
+			tuplizerMapping = new ComponentEntityModeToTuplizerMapping(component);
 		}
 
 		public string Role
@@ -48,6 +50,11 @@ public StandardProperty[] Properties
 			get { return properties; }
 		}
 
+		public ComponentEntityModeToTuplizerMapping TuplizerMapping
+		{
+			get { return tuplizerMapping; }
+		}
+
 		public StandardProperty GetProperty(int index)
 		{
 			if (index < 0 || index >= propertySpan)

src/NHibernate/Tuple/Entity/EntityEntityModeToTuplizerMapping.cs

@@ -41,11 +41,11 @@ public EntityEntityModeToTuplizerMapping(PersistentClass mappedEntity, EntityMet
 			if (!userSuppliedTuplizerImpls.TryGetValue(EntityMode.Map, out tuplizerImpl))
 			{
 				dynamicMapTuplizer = new DynamicMapEntityTuplizer(em, mappedEntity);
-				userSuppliedTuplizerImpls.Remove(EntityMode.Map);
 			}
 			else
 			{
 				dynamicMapTuplizer = BuildEntityTuplizer(tuplizerImpl, mappedEntity, em);
+				userSuppliedTuplizerImpls.Remove(EntityMode.Map);
 			}
 
 			// then the pojo tuplizer, using the dynamic-map tuplizer if no pojo representation is available