- Port of some base classes to prepare the port of some features from H3.2.5

- Refactoring

SVN: trunk@3089

Author: fabiomaulo

src/NHibernate.Test/NHSpecificTest/VersionTest.cs

@@ -10,7 +10,7 @@ public class VersionTest
 		[Test]
 		public void UnsavedNegativeIntOrShort()
 		{
-			Cascades.VersionValue negative = Cascades.VersionValue.VersionNegative;
+			VersionValue negative = VersionValue.VersionNegative;
 
 			Assert.AreEqual(true, negative.IsUnsaved((short) -1));
 			Assert.AreEqual(true, negative.IsUnsaved(-1));

src/NHibernate/Bytecode/CodeDom/BytecodeProviderImpl.cs

@@ -15,6 +15,16 @@ public class BytecodeProviderImpl : IBytecodeProvider
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(BytecodeProviderImpl));
 
+		#region IBytecodeProvider Members
+
+		public IProxyFactoryFactory ProxyFactoryFactory
+		{
+			get { return new DefaultProxyFactoryFactory(); }
+			set { throw new NotSupportedException(); }
+		}
+
+		#endregion
+
 		public IReflectionOptimizer GetReflectionOptimizer(System.Type clazz, IGetter[] getters, ISetter[] setters)
 		{
 			if (clazz.IsValueType)

src/NHibernate/Bytecode/DefaultProxyFactoryFactory.cs

@@ -0,0 +1,35 @@
+using System;
+using NHibernate.Proxy;
+
+namespace NHibernate.Bytecode
+{
+	public class DefaultProxyFactoryFactory : IProxyFactoryFactory
+	{
+		private readonly System.Type proxyFactoryClass;
+
+		public DefaultProxyFactoryFactory() {}
+
+		public DefaultProxyFactoryFactory(System.Type proxyFactoryClass)
+		{
+			this.proxyFactoryClass = proxyFactoryClass;
+		}
+
+		#region IProxyFactoryFactory Members
+
+		public IProxyFactory BuildProxyFactory()
+		{
+			if (proxyFactoryClass == null || proxyFactoryClass == typeof(CastleProxyFactory))
+				return new CastleProxyFactory();
+			try
+			{
+				return (IProxyFactory)Activator.CreateInstance(proxyFactoryClass);
+			}
+			catch (Exception e)
+			{
+				throw new HibernateException("Failed to create an instance of '" + proxyFactoryClass.FullName + "'!", e);
+			}
+		}
+
+		#endregion
+	}
+}

src/NHibernate/Bytecode/IBytecodeProvider.cs

@@ -1,12 +1,16 @@
-using System;
 using NHibernate.Property;
 
 namespace NHibernate.Bytecode
 {
 	public interface IBytecodeProvider
 	{
-		// Not ported: getProxyFactoryFactory() - there aren't any alternative proxy factory
-		// implementations yet
+		/// <summary> 
+		/// The specific factory for this provider capable of
+		/// generating run-time proxies for lazy-loading purposes.
+		///  </summary>
+		IProxyFactoryFactory ProxyFactoryFactory { get; set;}
+		// NH specific: we add the set method because NH-975; the responsability of
+		// ProxyFactory is of BytecodeProvider like H3.2
 
 		/// <summary>
 		/// Retrieve the <see cref="IReflectionOptimizer" /> delegate for this provider
@@ -17,5 +21,18 @@ public interface IBytecodeProvider
 		/// <param name="setters">All property setters to be accessed via reflection.</param>
 		/// <returns>The reflection optimization delegate.</returns>
 		IReflectionOptimizer GetReflectionOptimizer(System.Type clazz, IGetter[] getters, ISetter[] setters);
+
+		/// <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.
+		/// </param>
+		/// <param name="fieldFilter">
+		/// filter used to limit which fields are to be instrumented
+		/// via this ClassTransformer.
+		/// </param>
+		/// <returns> The appropriate ClassTransformer. </returns>
+		// Not ported
+		//ClassTransformer getTransformer(ClassFilter classFilter, FieldFilter fieldFilter);
+
 	}
 }

src/NHibernate/Bytecode/IProxyFactoryFactory.cs

@@ -0,0 +1,39 @@
+using NHibernate.Proxy;
+
+namespace NHibernate.Bytecode
+{
+	/// <summary> 
+	/// An interface for factories of <see cref="IProxyFactory">proxy factory</see> instances.
+	/// </summary>
+	/// <remarks>
+	/// Currently used to abstract from the tupizer even if... 
+	/// </remarks>
+	public interface IProxyFactoryFactory
+	{
+		/// <summary> 
+		/// Build a proxy factory specifically for handling runtime
+		/// lazy loading. 
+		/// </summary>
+		/// <returns> The lazy-load proxy factory. </returns>
+		IProxyFactory BuildProxyFactory();
+
+		/// <summary> Build a proxy factory for basic proxy concerns.  The return
+		/// should be capable of properly handling newInstance() calls.
+		/// <p/>
+		/// Should build basic proxies essentially equivalent to JDK proxies in
+		/// terms of capabilities, but should be able to deal with abstract super
+		/// classes in addition to proxy interfaces.
+		/// <p/>
+		/// Must pass in either superClass or interfaces (or both).
+		/// 
+		/// </summary>
+		/// <param name="superClass">The abstract super class (or null if none).
+		/// </param>
+		/// <param name="interfaces">Interfaces to be proxied (or null if none).
+		/// </param>
+		/// <returns> The proxy class
+		/// </returns>
+		// TODO: H3.2
+		//BasicProxyFactory buildBasicProxyFactory(System.Type superClass, System.Type[] interfaces);
+	}
+}

src/NHibernate/Bytecode/Lightweight/BytecodeProviderImpl.cs

@@ -1,5 +1,4 @@
 using System;
-using log4net;
 using NHibernate.Persister.Entity;
 using NHibernate.Property;
 
@@ -15,7 +14,15 @@ namespace NHibernate.Bytecode.Lightweight
 	/// </remarks>
 	public class BytecodeProviderImpl : IBytecodeProvider
 	{
-		private static readonly ILog log = LogManager.GetLogger(typeof(BytecodeProviderImpl));
+		#region IBytecodeProvider Members
+
+		public virtual IProxyFactoryFactory ProxyFactoryFactory
+		{
+			get { return new DefaultProxyFactoryFactory(); }
+			set { throw new NotSupportedException(); }
+		}
+
+		#endregion
 
 		/// <summary>
 		/// Generate the IReflectionOptimizer object

src/NHibernate/Bytecode/NullBytecodeProvider.cs

@@ -9,6 +9,16 @@ namespace NHibernate.Bytecode
 	/// </summary>
 	public class NullBytecodeProvider : IBytecodeProvider
 	{
+		#region IBytecodeProvider Members
+
+		public IProxyFactoryFactory ProxyFactoryFactory
+		{
+			get { return new DefaultProxyFactoryFactory(); }
+			set { throw new NotSupportedException(); }
+		}
+
+		#endregion
+
 		public IReflectionOptimizer GetReflectionOptimizer(System.Type clazz, IGetter[] getters, ISetter[] setters)
 		{
 			return null;

src/NHibernate/Cfg/Environment.cs

@@ -4,7 +4,6 @@
 using System.Reflection;
 using log4net;
 using NHibernate.Bytecode;
-using NHibernate.Bytecode.CodeDom;
 using NHibernate.Util;
 using NHibernate.Cfg.ConfigurationSchema;
 
@@ -294,7 +293,7 @@ private static IBytecodeProvider BuildBytecodeProvider(string providerName)
 			switch (providerName)
 			{
 				case "codedom":
-					return new BytecodeProviderImpl();
+					return new Bytecode.CodeDom.BytecodeProviderImpl();
 				case "lcg":
 					return new Bytecode.Lightweight.BytecodeProviderImpl();
 				case "null":

src/NHibernate/Cfg/XmlHbmBinding/ClassBinder.cs

@@ -550,7 +550,7 @@ protected void BindComponent(XmlNode node, Component model, System.Type reflecte
 			FetchMode[] joinedFetch = new FetchMode[span];
 
 			int i = 0;
-			foreach (Mapping.Property prop in model.PropertyCollection)
+			foreach (Mapping.Property prop in model.PropertyIterator)
 			{
 				names[i] = prop.Name;
 				types[i] = prop.Type;
@@ -569,7 +569,7 @@ protected void BindComponent(XmlNode node, Component model, System.Type reflecte
 				ISetter[] setters = new ISetter[span];
 				bool foundCustomAccessor = false;
 				i = 0;
-				foreach (Mapping.Property prop in model.PropertyCollection)
+				foreach (Mapping.Property prop in model.PropertyIterator)
 				{
 					setters[i] = prop.GetSetter(model.ComponentClass);
 					getters[i] = prop.GetGetter(model.ComponentClass);

src/NHibernate/Cfg/XmlHbmBinding/ClassCompositeIdBinder.cs

@@ -125,7 +125,7 @@ private void BindComponent(Component compositeId, System.Type reflectedClass, st
 			FetchMode[] joinedFetch = new FetchMode[span];
 
 			int i = 0;
-			foreach (Mapping.Property prop in compositeId.PropertyCollection)
+			foreach (Mapping.Property prop in compositeId.PropertyIterator)
 			{
 				names[i] = prop.Name;
 				types[i] = prop.Type;
@@ -145,7 +145,7 @@ private void BindComponent(Component compositeId, System.Type reflectedClass, st
 				ISetter[] setters = new ISetter[span];
 				bool foundCustomAccessor = false;
 				i = 0;
-				foreach (Mapping.Property prop in compositeId.PropertyCollection)
+				foreach (Mapping.Property prop in compositeId.PropertyIterator)
 				{
 					setters[i] = prop.GetSetter(compositeId.ComponentClass);
 					getters[i] = prop.GetGetter(compositeId.ComponentClass);

src/NHibernate/Cfg/XmlHbmBinding/ResultSetMappingBinder.cs

@@ -184,7 +184,7 @@ private IDictionary BindPropertyResults(string alias, HbmReturnDiscriminator dis
 					if (value is Component)
 					{
 						Component comp = (Component) value;
-						parentPropIter = comp.PropertyCollection;
+						parentPropIter = comp.PropertyIterator;
 					}
 					else if (value is ToOne)
 					{
@@ -194,7 +194,7 @@ private IDictionary BindPropertyResults(string alias, HbmReturnDiscriminator dis
 							try
 							{
 								parentPropIter =
-									((Component) referencedPc.GetRecursiveProperty(toOne.ReferencedPropertyName).Value).PropertyCollection;
+									((Component) referencedPc.GetRecursiveProperty(toOne.ReferencedPropertyName).Value).PropertyIterator;
 							}
 							catch (InvalidCastException e)
 							{
@@ -203,7 +203,7 @@ private IDictionary BindPropertyResults(string alias, HbmReturnDiscriminator dis
 						else
 							try
 							{
-								parentPropIter = ((Component) referencedPc.IdentifierProperty.Value).PropertyCollection;
+								parentPropIter = ((Component) referencedPc.IdentifierProperty.Value).PropertyIterator;
 							}
 							catch (InvalidCastException e)
 							{