Implement a new StaticProxyFactoryFactory

Author: hazzik

src/NHibernate/Bytecode/AbstractBytecodeProvider.cs

@@ -29,7 +29,7 @@ public virtual IProxyFactoryFactory ProxyFactoryFactory
 					}
 				}
 
-				return DefaultProxyFactoryFactory.Instance;
+				return StaticProxyFactoryFactory.Instance;
 			}
 		}
 

src/NHibernate/Bytecode/DefaultProxyFactoryFactory.cs

@@ -4,7 +4,7 @@ namespace NHibernate.Bytecode
 {
 	public class DefaultProxyFactoryFactory : IProxyFactoryFactory
 	{
-		internal static DefaultProxyFactoryFactory Instance = new DefaultProxyFactoryFactory();
+		#region IProxyFactoryFactory Members
 
 		public IProxyFactory BuildProxyFactory()
 		{
@@ -25,5 +25,7 @@ public bool IsProxy(object entity)
 		{
 			return entity is INHibernateProxy;
 		}
+
+		#endregion
 	}
-}
+}

src/NHibernate/Bytecode/StaticProxyFactoryFactory.cs

@@ -0,0 +1,17 @@
+using NHibernate.Proxy;
+
+namespace NHibernate.Bytecode
+{
+	public class StaticProxyFactoryFactory : IProxyFactoryFactory
+	{
+		internal static StaticProxyFactoryFactory Instance = new StaticProxyFactoryFactory();
+
+		public IProxyFactory BuildProxyFactory() => new DefaultProxyFactory();
+
+		public IProxyValidator ProxyValidator => new DynProxyTypeValidator();
+
+		public bool IsInstrumented(System.Type entityClass) => true;
+
+		public bool IsProxy(object entity) => entity is INHibernateProxy;
+	}
+}

src/NHibernate/Proxy/DefaultProxyFactory.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Concurrent;
-using System.Linq.Expressions;
 using NHibernate.Engine;
 using NHibernate.Intercept;
 using NHibernate.Proxy.DynamicProxy;
@@ -9,20 +7,20 @@ namespace NHibernate.Proxy
 {
 	public class DefaultProxyFactory : AbstractProxyFactory
 	{
-		static readonly ConcurrentDictionary<ProxyCacheEntry, Func<ILazyInitializer, NHibernateProxyFactoryInfo, INHibernateProxy>> Cache =
-			new ConcurrentDictionary<ProxyCacheEntry, Func<ILazyInitializer, NHibernateProxyFactoryInfo, INHibernateProxy>>();
-
+		private readonly ProxyFactory factory = new ProxyFactory();
 		protected static readonly INHibernateLogger log = NHibernateLogger.For(typeof (DefaultProxyFactory));
 
 		public override INHibernateProxy GetProxy(object id, ISessionImplementor session)
 		{
 			try
 			{
-				var cacheEntry = new ProxyCacheEntry(IsClassProxy ? PersistentClass : typeof(object), Interfaces);
-				var proxyActivator = Cache.GetOrAdd(cacheEntry, pke => CreateProxyActivator(pke));
-				return proxyActivator(
-					new LiteLazyInitializer(EntityName, id, session, PersistentClass),
-					new NHibernateProxyFactoryInfo(EntityName, PersistentClass, Interfaces, GetIdentifierMethod, SetIdentifierMethod, ComponentIdType));
+				var initializer = new DefaultLazyInitializer(EntityName, PersistentClass, id, GetIdentifierMethod, SetIdentifierMethod, ComponentIdType, session, OverridesEquals);
+
+				object proxyInstance = IsClassProxy
+										? factory.CreateProxy(PersistentClass, initializer, Interfaces)
+										: factory.CreateProxy(Interfaces[0], initializer, Interfaces);
+
+				return (INHibernateProxy) proxyInstance;
 			}
 			catch (Exception ex)
 			{
@@ -31,21 +29,10 @@ public override INHibernateProxy GetProxy(object id, ISessionImplementor session
 			}
 		}
 
-		Func<ILazyInitializer, NHibernateProxyFactoryInfo, INHibernateProxy> CreateProxyActivator(ProxyCacheEntry pke)
-		{				
-			var proxyBuilder = new NHibernateProxyBuilder(GetIdentifierMethod, SetIdentifierMethod, ComponentIdType, OverridesEquals);
-			var type = proxyBuilder.CreateProxyType(pke.BaseType, pke.Interfaces);
-			var ctor = type.GetConstructor(new[] {typeof(ILazyInitializer), typeof(NHibernateProxyFactoryInfo)});
-			var li = Expression.Parameter(typeof(ILazyInitializer));
-			var pf = Expression.Parameter(typeof(NHibernateProxyFactoryInfo));
-			return Expression.Lambda<Func<ILazyInitializer, NHibernateProxyFactoryInfo, INHibernateProxy>>(Expression.New(ctor, li, pf), li, pf).Compile();
-		}
-
 		public override object GetFieldInterceptionProxy(object instanceToWrap)
 		{
-			var factory = new ProxyFactory();
 			var interceptor = new DefaultDynamicLazyFieldInterceptor();
 			return factory.CreateProxy(PersistentClass, interceptor, new[] { typeof(IFieldInterceptorAccessor) });
 		}
 	}
-}
+}

src/NHibernate/Proxy/StaticProxyFactory.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Concurrent;
+using System.Linq.Expressions;
+using NHibernate.Engine;
+using NHibernate.Intercept;
+using NHibernate.Proxy.DynamicProxy;
+
+namespace NHibernate.Proxy
+{
+	public class StaticProxyFactory : AbstractProxyFactory
+	{
+		static readonly ConcurrentDictionary<ProxyCacheEntry, Func<ILazyInitializer, NHibernateProxyFactoryInfo, INHibernateProxy>> Cache =
+			new ConcurrentDictionary<ProxyCacheEntry, Func<ILazyInitializer, NHibernateProxyFactoryInfo, INHibernateProxy>>();
+
+		protected static readonly INHibernateLogger log = NHibernateLogger.For(typeof (DefaultProxyFactory));
+
+		public override INHibernateProxy GetProxy(object id, ISessionImplementor session)
+		{
+			try
+			{
+				var cacheEntry = new ProxyCacheEntry(IsClassProxy ? PersistentClass : typeof(object), Interfaces);
+				var proxyActivator = Cache.GetOrAdd(cacheEntry, pke => CreateProxyActivator(pke));
+				return proxyActivator(
+					new LiteLazyInitializer(EntityName, id, session, PersistentClass),
+					new NHibernateProxyFactoryInfo(EntityName, PersistentClass, Interfaces, GetIdentifierMethod, SetIdentifierMethod, ComponentIdType));
+			}
+			catch (Exception ex)
+			{
+				log.Error(ex, "Creating a proxy instance failed");
+				throw new HibernateException("Creating a proxy instance failed", ex);
+			}
+		}
+
+		Func<ILazyInitializer, NHibernateProxyFactoryInfo, INHibernateProxy> CreateProxyActivator(ProxyCacheEntry pke)
+		{				
+			var proxyBuilder = new NHibernateProxyBuilder(GetIdentifierMethod, SetIdentifierMethod, ComponentIdType, OverridesEquals);
+			var type = proxyBuilder.CreateProxyType(pke.BaseType, pke.Interfaces);
+			var ctor = type.GetConstructor(new[] {typeof(ILazyInitializer), typeof(NHibernateProxyFactoryInfo)});
+			var li = Expression.Parameter(typeof(ILazyInitializer));
+			var pf = Expression.Parameter(typeof(NHibernateProxyFactoryInfo));
+			return Expression.Lambda<Func<ILazyInitializer, NHibernateProxyFactoryInfo, INHibernateProxy>>(Expression.New(ctor, li, pf), li, pf).Compile();
+		}
+
+		public override object GetFieldInterceptionProxy(object instanceToWrap)
+		{
+			var factory = new ProxyFactory();
+			var interceptor = new DefaultDynamicLazyFieldInterceptor();
+			return factory.CreateProxy(PersistentClass, interceptor, new[] { typeof(IFieldInterceptorAccessor) });
+		}
+	}
+}