One more step for injectable ICollectionTypeFactory

SVN: trunk@4457

Author: fabiomaulo

src/NHibernate/Bytecode/AbstractBytecodeProvider.cs

@@ -8,6 +8,7 @@ public abstract class AbstractBytecodeProvider : IBytecodeProvider, IInjectableP
 	{
 		private readonly IObjectsFactory objectsFactory = new ActivatorObjectsFactory();
 		protected System.Type proxyFactoryFactory;
+		private ICollectionTypeFactory collectionTypeFactory;
 
 		#region IBytecodeProvider Members
 
@@ -38,6 +39,34 @@ public virtual IObjectsFactory ObjectsFactory
 			get { return objectsFactory; }
 		}
 
+		public ICollectionTypeFactory CollectionTypeFactory
+		{
+			get
+			{
+				if (collectionTypeFactory == null)
+				{
+					try
+					{
+						collectionTypeFactory =
+							(ICollectionTypeFactory) ObjectsFactory.CreateInstance(typeof (Type.DefaultCollectionTypeFactory));
+					}
+					catch (Exception e)
+					{
+						throw new HibernateByteCodeException("Failed to create an instance of CollectionTypeFactory!", e);
+					}
+				}
+				return collectionTypeFactory;
+			}
+			protected set
+			{
+				if(value == null)
+				{
+					throw new InvalidOperationException("The CollectionTypeFactory can't be null.");
+				}
+				collectionTypeFactory = value;
+			}
+		}
+
 		#endregion
 
 		#region IInjectableProxyFactoryFactory Members

src/NHibernate/Bytecode/IBytecodeProvider.cs

@@ -20,8 +20,19 @@ public interface IBytecodeProvider
 		/// <returns>The reflection optimization delegate.</returns>
 		IReflectionOptimizer GetReflectionOptimizer(System.Type clazz, IGetter[] getters, ISetter[] setters);
 
+		/// <summary>
+		/// NHibernate's object instaciator.
+		/// </summary>
+		/// <remarks>
+		/// For entities <see cref="IReflectionOptimizer"/> and its implementations.
+		/// </remarks>
 		IObjectsFactory ObjectsFactory { get; }
 
+		/// <summary>
+		/// Instanciator of NHibernate's collections default types.
+		/// </summary>
+		ICollectionTypeFactory CollectionTypeFactory { get; }
+
 		// <summary> Generate a ClassTransformer capable of performing bytecode manipulation. </summary>
 		// <param name="classFilter">
 		// filter used to limit which classes are to be instrumented via this ClassTransformer.

src/NHibernate/Type/ICollectionTypeFactory.cs src/NHibernate/Bytecode/ICollectionTypeFactory.cs

@@ -1,6 +1,8 @@
 using System.Collections;
 using System.Collections.Generic;
-namespace NHibernate.Type
+using NHibernate.Type;
+
+namespace NHibernate.Bytecode
 {
 	/// <summary>
 	/// Type factory for collections types.

src/NHibernate/Bytecode/IObjectsFactory.cs

@@ -1,5 +1,8 @@
 namespace NHibernate.Bytecode
 {
+	/// <summary>
+	/// Interface for instanciate all NHibernate objects.
+	/// </summary>
 	public interface IObjectsFactory
 	{
 		/// <summary>

src/NHibernate/NHibernate.csproj

@@ -603,8 +603,8 @@
     <Compile Include="Tool\hbm2ddl\SchemaMetadataUpdater.cs" />
     <Compile Include="Transaction\AdoNetWithDistrubtedTransactionFactory.cs" />
     <Compile Include="Transform\ToListResultTransformer.cs" />
-    <Compile Include="Type\CollectionTypeFactory.cs" />
-    <Compile Include="Type\ICollectionTypeFactory.cs" />
+    <Compile Include="Type\DefaultCollectionTypeFactory.cs" />
+    <Compile Include="Bytecode\ICollectionTypeFactory.cs" />
     <Compile Include="Util\NullableDictionary.cs" />
     <Compile Include="Hql\Ast\ANTLR\Util\PathHelper.cs" />
     <Compile Include="Hql\Ast\ANTLR\Util\SyntheticAndFactory.cs" />

src/NHibernate/Type/CollectionTypeFactory.cs src/NHibernate/Type/DefaultCollectionTypeFactory.cs

@@ -1,9 +1,10 @@
 using System.Collections;
 using System.Collections.Generic;
+using NHibernate.Bytecode;
 
 namespace NHibernate.Type
 {
-	public class CollectionTypeFactory : ICollectionTypeFactory
+	public class DefaultCollectionTypeFactory : ICollectionTypeFactory
 	{
 		public virtual CollectionType Array(string role, string propertyRef, bool embedded, System.Type elementClass)
 		{

src/NHibernate/Type/TypeFactory.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Reflection;
+using NHibernate.Bytecode;
 using NHibernate.Classic;
 using NHibernate.Engine;
 using NHibernate.Intercept;
@@ -95,10 +96,7 @@ private static void RegisterType(System.Type systemType, IType nhibernateType, s
 		/// <summary></summary>
 		static TypeFactory()
 		{
-			Instance =
-				new TypeFactory(
-					(ICollectionTypeFactory)
-					Cfg.Environment.BytecodeProvider.ObjectsFactory.CreateInstance(typeof (CollectionTypeFactory)));
+			Instance = new TypeFactory();
 
 			//basicTypes.Add(NHibernate.Blob.Name, NHibernate.Blob);
 			//basicTypes.Add(NHibernate.Clob.Name, NHibernate.Clob);
@@ -184,11 +182,16 @@ NH will choose "datetime" when no type is specified in the mapping*/
 			getTypeDelegatesWithPrecision.Add(NHibernateUtil.Decimal.Name, GetDecimalType);
 		}
 
-		public ICollectionTypeFactory CollectionTypeFactory { get; private set; }
+		public ICollectionTypeFactory CollectionTypeFactory
+		{
+			get
+			{
+				return Cfg.Environment.BytecodeProvider.CollectionTypeFactory;
+			}
+		}
 
-		private TypeFactory(ICollectionTypeFactory collectionTypeFactory)
+		private TypeFactory()
 		{
-			CollectionTypeFactory = collectionTypeFactory;
 		}
 
 		/// <summary>