New StaticProxyFactoryFactory

src/NHibernate.Test/Bytecode/Lightweight/BytecodeProviderFixture.cs

@@ -14,7 +14,7 @@ public void NotConfiguredProxyFactoryFactory()
 		{
 			var bcp = new BytecodeProviderImpl();
 			IProxyFactoryFactory p = bcp.ProxyFactoryFactory;
-			Assert.That(p, Is.InstanceOf<DefaultProxyFactoryFactory>());
+			Assert.That(p, Is.InstanceOf<StaticProxyFactoryFactory>());
 		}
 
 		[Test]

src/NHibernate/Bytecode/AbstractBytecodeProvider.cs

@@ -28,7 +28,8 @@ public virtual IProxyFactoryFactory ProxyFactoryFactory
 						throw new HibernateByteCodeException("Failed to create an instance of '" + proxyFactoryFactory.FullName + "'!", e);
 					}
 				}
-				return new DefaultProxyFactoryFactory();
+
+				return StaticProxyFactoryFactory.Instance;
 			}
 		}
 
@@ -116,4 +117,4 @@ public void SetCollectionTypeFactoryClass(System.Type type)
 
 		#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 StaticProxyFactory();
+
+		public IProxyValidator ProxyValidator => new DynProxyTypeValidator();
+
+		public bool IsInstrumented(System.Type entityClass) => true;
+
+		public bool IsProxy(object entity) => entity is INHibernateProxy;
+	}
+}

src/NHibernate/Proxy/DynamicProxy/DefaultProxyMethodBuilder.cs

@@ -30,7 +30,7 @@ public DefaultyProxyMethodBuilder(IMethodBodyEmitter emitter)
 
 		public IMethodBodyEmitter MethodBodyEmitter { get; private set; }
 
-		private static MethodBuilder GenerateMethodSignature(string name, MethodInfo method, TypeBuilder typeBuilder)
+		internal static MethodBuilder GenerateMethodSignature(string name, MethodInfo method, TypeBuilder typeBuilder)
 		{
 			//TODO: Should we use attributes of base method?
 			var methodAttributes = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Virtual;

src/NHibernate/Proxy/DynamicProxy/ProxyFactory.cs

@@ -21,11 +21,11 @@ public sealed class ProxyFactory
 	{
 		internal static readonly ConcurrentDictionary<ProxyCacheEntry, TypeInfo> _cache = new ConcurrentDictionary<ProxyCacheEntry, TypeInfo>();
 
-		private static readonly ConstructorInfo defaultBaseConstructor = typeof(object).GetConstructor(new System.Type[0]);
+		internal static readonly ConstructorInfo defaultBaseConstructor = typeof(object).GetConstructor(new System.Type[0]);
 
 		private static readonly MethodInfo getValue = ReflectHelper.GetMethod<SerializationInfo>(
 			si => si.GetValue(null, null));
-		private static readonly MethodInfo setType = ReflectHelper.GetMethod<SerializationInfo>(
+		internal static readonly MethodInfo setType = ReflectHelper.GetMethod<SerializationInfo>(
 			si => si.SetType(null));
 		private static readonly MethodInfo addValue = ReflectHelper.GetMethod<SerializationInfo>(
 			si => si.AddValue(null, null));
@@ -129,7 +129,7 @@ private TypeInfo CreateUncachedProxyType(System.Type baseType, IReadOnlyCollecti
 			return proxyType;
 		}
 
-		private IEnumerable<MethodInfo> GetProxiableMethods(System.Type type, IEnumerable<System.Type> interfaces)
+		internal static IEnumerable<MethodInfo> GetProxiableMethods(System.Type type, IEnumerable<System.Type> interfaces)
 		{
 			const BindingFlags candidateMethodsBindingFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
 			return
@@ -139,7 +139,7 @@ private IEnumerable<MethodInfo> GetProxiableMethods(System.Type type, IEnumerabl
 					.Distinct();
 		}
 
-		private static ConstructorBuilder DefineConstructor(TypeBuilder typeBuilder, System.Type parentType)
+		internal static ConstructorBuilder DefineConstructor(TypeBuilder typeBuilder, System.Type parentType)
 		{
 			const MethodAttributes constructorAttributes = MethodAttributes.Public |
 														   MethodAttributes.HideBySig | MethodAttributes.SpecialName |
@@ -166,7 +166,7 @@ private static ConstructorBuilder DefineConstructor(TypeBuilder typeBuilder, Sys
 			return constructor;
 		}
 
-		private static void ImplementGetObjectData(System.Type baseType, IReadOnlyCollection<System.Type> baseInterfaces, TypeBuilder typeBuilder, FieldInfo interceptorField)
+		internal static void ImplementGetObjectData(System.Type baseType, IReadOnlyCollection<System.Type> baseInterfaces, TypeBuilder typeBuilder, FieldInfo interceptorField)
 		{
 			const MethodAttributes attributes = MethodAttributes.Public | MethodAttributes.HideBySig |
 												MethodAttributes.Virtual;
@@ -217,7 +217,7 @@ private static void ImplementGetObjectData(System.Type baseType, IReadOnlyCollec
 			IL.Emit(OpCodes.Ret);
 		}
 
-		private static void DefineSerializationConstructor(TypeBuilder typeBuilder, FieldInfo interceptorField, ConstructorBuilder defaultConstructor)
+		internal static void DefineSerializationConstructor(TypeBuilder typeBuilder, FieldInfo interceptorField, ConstructorBuilder defaultConstructor)
 		{
 			const MethodAttributes constructorAttributes = MethodAttributes.Public |
 														   MethodAttributes.HideBySig | MethodAttributes.SpecialName |
@@ -254,7 +254,7 @@ private static void DefineSerializationConstructor(TypeBuilder typeBuilder, Fiel
 			IL.Emit(OpCodes.Ret);
 		}
 
-		private static void AddSerializationSupport(System.Type baseType, IReadOnlyCollection<System.Type> baseInterfaces, TypeBuilder typeBuilder, FieldInfo interceptorField, ConstructorBuilder defaultConstructor)
+		internal static void AddSerializationSupport(System.Type baseType, IReadOnlyCollection<System.Type> baseInterfaces, TypeBuilder typeBuilder, FieldInfo interceptorField, ConstructorBuilder defaultConstructor)
 		{
 			ConstructorInfo serializableConstructor = typeof(SerializableAttribute).GetConstructor(new System.Type[0]);
 			var customAttributeBuilder = new CustomAttributeBuilder(serializableConstructor, new object[0]);

src/NHibernate/Proxy/LiteLazyInitializer.cs

@@ -0,0 +1,17 @@
+using System;
+using NHibernate.Engine;
+
+namespace NHibernate.Proxy
+{
+	[Serializable]
+	sealed class LiteLazyInitializer : AbstractLazyInitializer
+	{
+		internal LiteLazyInitializer(string entityName, object id, ISessionImplementor session, System.Type persistentClass) 
+			: base(entityName, id, session)
+		{
+			PersistentClass = persistentClass;
+		}
+
+		public override System.Type PersistentClass { get; }
+	}
+}