Refactoring SessionFactoryImpl (generics collection part I )

SVN: trunk@3522

Author: fabiomaulo

src/NHibernate/Action/BulkOperationCleanupAction.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Iesi.Collections;
 using Iesi.Collections.Generic;
 using NHibernate.Engine;
 using NHibernate.Persister.Entity;
@@ -16,7 +15,7 @@ public class BulkOperationCleanupAction: IExecutable
 	{
 		private readonly ISessionImplementor session;
 		private readonly HashedSet<string> affectedEntityNames= new HashedSet<string>();
-		private readonly HashedSet affectedCollectionRoles= new HashedSet();
+		private readonly HashedSet<string> affectedCollectionRoles = new HashedSet<string>();
 		private readonly List<string> spaces;
 
 		public BulkOperationCleanupAction(ISessionImplementor session, IQueryable[] affectedQueryables)
@@ -29,7 +28,7 @@ public BulkOperationCleanupAction(ISessionImplementor session, IQueryable[] affe
 				{
 					affectedEntityNames.Add(affectedQueryables[i].EntityName);
 				}
-				ISet roles = session.Factory.GetCollectionRolesByEntityParticipant(affectedQueryables[i].EntityName);
+				ISet<string> roles = session.Factory.GetCollectionRolesByEntityParticipant(affectedQueryables[i].EntityName);
 				if (roles != null)
 				{
 					affectedCollectionRoles.AddAll(roles);
@@ -65,7 +64,7 @@ public BulkOperationCleanupAction(ISessionImplementor session, ISet<string> quer
 					{
 						affectedEntityNames.Add(persister.EntityName);
 					}
-					ISet roles = session.Factory.GetCollectionRolesByEntityParticipant(persister.EntityName);
+					ISet<string> roles = session.Factory.GetCollectionRolesByEntityParticipant(persister.EntityName);
 					if (roles != null)
 					{
 						affectedCollectionRoles.AddAll(roles);

src/NHibernate/Engine/ISessionFactoryImplementor.cs

@@ -1,4 +1,7 @@
+using System.Collections;
+using System.Collections.Generic;
 using System.Data;
+using Iesi.Collections.Generic;
 using NHibernate.Cache;
 using NHibernate.Context;
 using NHibernate.Dialect.Function;
@@ -13,9 +16,6 @@
 using NHibernate.Stat;
 using NHibernate.Transaction;
 using NHibernate.Type;
-using System.Collections;
-using Iesi.Collections;
-using System.Collections.Generic;
 
 namespace NHibernate.Engine
 {
@@ -147,7 +147,7 @@ public interface ISessionFactoryImplementor : IMapping, ISessionFactory
 		/// <summary>
 		/// Get the identifier generator for the hierarchy
 		/// </summary>
-		IIdentifierGenerator GetIdentifierGenerator(System.Type rootClass);
+		IIdentifierGenerator GetIdentifierGenerator(string rootEntityName);
 
 		ResultSetMappingDefinition GetResultSetMapping(string resultSetRef);
 
@@ -207,7 +207,7 @@ ISession OpenSession(
 		/// <returns> 
 		/// Set of all the collection roles in which the given entityName participates.
 		/// </returns>
-		ISet GetCollectionRolesByEntityParticipant(string entityName);
+		ISet<string> GetCollectionRolesByEntityParticipant(string entityName);
 
 		/// <summary> The cache of table update timestamps</summary>
 		UpdateTimestampsCache UpdateTimestampsCache { get;}

src/NHibernate/Event/Default/DefaultEvictEventListener.cs

@@ -28,7 +28,7 @@ public virtual void OnEvict(EvictEvent @event)
 			{
 				ILazyInitializer li = ((INHibernateProxy)obj).HibernateLazyInitializer;
 				object id = li.Identifier;
-				IEntityPersister persister = source.Factory.GetEntityPersister(li.PersistentClass);
+				IEntityPersister persister = source.Factory.GetEntityPersister(li.EntityName);
 				if (id == null)
 				{
 					throw new ArgumentException("null identifier");

src/NHibernate/ISessionFactory.cs

@@ -98,7 +98,7 @@ public interface ISessionFactory : IDisposable
 		/// to metadata object
 		/// </summary>
 		/// <returns></returns>
-		IDictionary GetAllCollectionMetadata();
+		IDictionary<string, ICollectionMetadata> GetAllCollectionMetadata();
 
 		/// <summary>
 		/// Destroy this <c>SessionFactory</c> and release all resources 

src/NHibernate/Impl/AbstractQueryImpl.cs

@@ -210,7 +210,7 @@ private IType GuessType(System.Type clazz)
 			{
 				try
 				{
-					session.Factory.GetEntityPersister(clazz);
+					session.Factory.GetEntityPersister(clazz.FullName);
 				}
 				catch (MappingException)
 				{