Possible BREAKING CHANGE for external frameworks:

- see changes in ISessionFactory

SVN: trunk@3526

Author: fabiomaulo

src/NHibernate/Action/BulkOperationCleanupAction.cs

@@ -1,8 +1,8 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using Iesi.Collections.Generic;
 using NHibernate.Engine;
+using NHibernate.Metadata;
 using NHibernate.Persister.Entity;
 
 namespace NHibernate.Action
@@ -51,10 +51,10 @@ public BulkOperationCleanupAction(ISessionImplementor session, ISet<string> quer
 
 			ISet<string> tmpSpaces = new HashedSet<string>(querySpaces);
 			ISessionFactoryImplementor factory = session.Factory;
-			IDictionary acmd = factory.GetAllClassMetadata();
-			foreach (DictionaryEntry entry in acmd)
+			IDictionary<string, IClassMetadata> acmd = factory.GetAllClassMetadata();
+			foreach (KeyValuePair<string, IClassMetadata> entry in acmd)
 			{
-				string entityName = ((System.Type) entry.Key).FullName;
+				string entityName = entry.Key;
 				IEntityPersister persister = factory.GetEntityPersister(entityName);
 				string[] entitySpaces = persister.QuerySpaces;
 

src/NHibernate/ISessionFactory.cs

@@ -73,11 +73,18 @@ public interface ISessionFactory : IDisposable
 		IDatabinder OpenDatabinder();
 
 		/// <summary>
-		/// Get the <c>ClassMetadata</c> associated with the given entity class
+		/// Get the <see cref="IClassMetadata"/> associated with the given entity class
 		/// </summary>
-		/// <param name="persistentType"></param>
-		/// <returns></returns>
-		IClassMetadata GetClassMetadata(System.Type persistentType);
+		/// <param name="persistentClass">the given entity type.</param>
+		/// <returns>The class metadata or <see langword="null"/> if not found.</returns>
+		/// <seealso cref="IClassMetadata"/>
+		IClassMetadata GetClassMetadata(System.Type persistentClass);
+
+		/// <summary> Get the <see cref="IClassMetadata"/> associated with the given entity name </summary>
+		/// <param name="entityName">the given entity name.</param>
+		/// <returns>The class metadata or <see langword="null"/> if not found.</returns>
+		/// <seealso cref="IClassMetadata"/>
+		IClassMetadata GetClassMetadata(string entityName);
 
 		/// <summary>
 		/// Get the <c>CollectionMetadata</c> associated with the named collection role
@@ -86,12 +93,12 @@ public interface ISessionFactory : IDisposable
 		/// <returns></returns>
 		ICollectionMetadata GetCollectionMetadata(string roleName);
 
-		/// <summary>
-		/// Get all <c>ClassMetadata</c> as a <c>IDictionary</c> from <c>Type</c>
+		/// <summary> 
+		/// Get all <see cref="IClassMetadata"/> as a <see cref="IDictionary"/> from entityname <see langword="string"/>
 		/// to metadata object
 		/// </summary>
-		/// <returns></returns>
-		IDictionary GetAllClassMetadata();
+		/// <returns> A dictionary from <see langword="string"/> an entity name to <see cref="IClassMetadata"/> </returns>
+		IDictionary<string, IClassMetadata> GetAllClassMetadata();
 
 		/// <summary>
 		/// Get all <c>CollectionMetadata</c> as a <c>IDictionary</c> from role name

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -93,7 +93,7 @@ public void HandleEntityNotFound(string entityName, object id)
 
 		[NonSerialized] private readonly IDictionary classPersistersByName;
 
-		[NonSerialized] private readonly IDictionary classMetadata;
+		[NonSerialized] private readonly IDictionary<string, IClassMetadata> classMetadata;
 
 		[NonSerialized] private readonly Dictionary<string, ICollectionPersister> collectionPersisters;
 
@@ -190,7 +190,7 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 			IDictionary caches = new Hashtable();
 			entityPersisters = new Hashtable();
 			classPersistersByName = new Hashtable();
-			IDictionary classMeta = new Hashtable();
+			Dictionary<string, IClassMetadata> classMeta = new Dictionary<string, IClassMetadata>();
 
 			foreach (PersistentClass model in cfg.ClassMappings)
 			{
@@ -220,9 +220,9 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 				// Imports provide the ability to jump from the Classname to the AssemblyQualifiedName.
 				classPersistersByName[model.MappedClass.AssemblyQualifiedName] = cp;
 
-				classMeta[model.MappedClass] = cp.ClassMetadata;
+				classMeta[model.EntityName] = cp.ClassMetadata;
 			}
-			classMetadata = new Hashtable(classMeta);
+			classMetadata = new UnmodifiableDictionary<string, IClassMetadata>(classMeta);
 			Dictionary<string, ISet<string>> tmpEntityToCollectionRoleMap = new Dictionary<string, ISet<string>>();
 			collectionPersisters = new Dictionary<string, ICollectionPersister>();
 			foreach (Mapping.Collection map in cfg.CollectionMappings)
@@ -926,7 +926,14 @@ public string DefaultSchema
 
 		public IClassMetadata GetClassMetadata(System.Type persistentClass)
 		{
-			return GetEntityPersister(persistentClass).ClassMetadata;
+			return GetClassMetadata(persistentClass.FullName);
+		}
+
+		public IClassMetadata GetClassMetadata(string entityName)
+		{
+			IClassMetadata result;
+			classMetadata.TryGetValue(entityName, out result);
+			return result;
 		}
 
 		public ICollectionMetadata GetCollectionMetadata(string roleName)
@@ -1012,7 +1019,7 @@ public string GetImportedClassName(string className)
 		}
 
 		/// <summary></summary>
-		public IDictionary GetAllClassMetadata()
+		public IDictionary<string, IClassMetadata> GetAllClassMetadata()
 		{
 			return classMetadata;
 		}