Merge pull request #1709 from fredericDelaporte/LazyPropertiesStaticProxy

Implement a lazy properties static proxy

Author: fredericDelaporte

src/AsyncGenerator.yml

@@ -196,6 +196,8 @@
       name: LinqReadonlyTestsContext
     - conversion: Ignore
       name: MultiThreadRunner
+    - conversion: Ignore
+      name: PeVerifier
     - conversion: Ignore
       hasAttributeName: IgnoreAttribute
     - conversion: NewType

src/NHibernate.Test/Async/DynamicEntity/Interceptor/InterceptorDynamicEntity.cs

@@ -8,6 +8,7 @@
 //------------------------------------------------------------------------------
 
 
+using System;
 using System.Collections;
 using NHibernate.Cfg;
 using NUnit.Framework;
@@ -16,6 +17,7 @@ namespace NHibernate.Test.DynamicEntity.Interceptor
 {
 	using System.Threading.Tasks;
 	[TestFixture]
+	[Obsolete("Require dynamic proxies")]
 	public class InterceptorDynamicEntityAsync : TestCase
 	{
 		protected override string MappingsAssembly
@@ -100,4 +102,4 @@ public async Task ItAsync()
 			session.Close();
 		}
 	}
-}
+}

src/NHibernate.Test/Async/DynamicEntity/Tuplizer/TuplizerDynamicEntity.cs

@@ -8,6 +8,7 @@
 //------------------------------------------------------------------------------
 
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using NHibernate.Cfg;
@@ -17,6 +18,7 @@ namespace NHibernate.Test.DynamicEntity.Tuplizer
 {
 	using System.Threading.Tasks;
 	[TestFixture]
+	[Obsolete("Require dynamic proxies")]
 	public class TuplizerDynamicEntityAsync : TestCase
 	{
 		protected override string MappingsAssembly
@@ -116,4 +118,4 @@ public async Task ItAsync()
 			session.Close();
 		}
 	}
-}
+}

src/NHibernate.Test/Async/DynamicProxyTests/PeVerifier.cs

@@ -9,7 +9,6 @@
 using NHibernate.Driver;
 using NHibernate.Exceptions;
 using NHibernate.Hql.Ast.ANTLR;
-using NHibernate.Linq;
 using NHibernate.Type;
 using NUnit.Framework;
 
@@ -37,7 +36,7 @@ public void CompleteConfiguration()
 					.Through<DefaultCollectionTypeFactory>()
 				.Proxy
 					.DisableValidation()
-					.Through<DefaultProxyFactoryFactory>()
+					.Through<StaticProxyFactoryFactory>()
 				.ParsingHqlThrough<ASTQueryTranslatorFactory>()
 				.Mapping
 					.UsingDefaultCatalog("MyCatalog")
@@ -75,7 +74,7 @@ public void CompleteConfiguration()
 			Assert.That(cfg.Properties[Environment.CacheDefaultExpiration], Is.EqualTo("15"));
 			Assert.That(cfg.Properties[Environment.CollectionTypeFactoryClass], Is.EqualTo(typeof(DefaultCollectionTypeFactory).AssemblyQualifiedName));
 			Assert.That(cfg.Properties[Environment.UseProxyValidator], Is.EqualTo("false"));
-			Assert.That(cfg.Properties[Environment.ProxyFactoryFactoryClass], Is.EqualTo(typeof(DefaultProxyFactoryFactory).AssemblyQualifiedName));
+			Assert.That(cfg.Properties[Environment.ProxyFactoryFactoryClass], Is.EqualTo(typeof(StaticProxyFactoryFactory).AssemblyQualifiedName));
 			Assert.That(cfg.Properties[Environment.QueryTranslator], Is.EqualTo(typeof(ASTQueryTranslatorFactory).AssemblyQualifiedName));
 			Assert.That(cfg.Properties[Environment.DefaultCatalog], Is.EqualTo("MyCatalog"));
 			Assert.That(cfg.Properties[Environment.DefaultSchema], Is.EqualTo("MySche"));
@@ -108,13 +107,13 @@ public void UseDbConfigurationStringBuilder()
 			// The place where put default properties values is the Dialect itself.
 			var cfg = new Configuration();
 			cfg.SessionFactory()
-				.Proxy.Through<DefaultProxyFactoryFactory>()
+				.Proxy.Through<StaticProxyFactoryFactory>()
 				.Integrate
 					.Using<MsSql2005Dialect>()
 					.Connected
 						.Using(new SqlConnectionStringBuilder { DataSource = "(local)", InitialCatalog = "nhibernate", IntegratedSecurity = true });
 
-			Assert.That(cfg.Properties[Environment.ProxyFactoryFactoryClass], Is.EqualTo(typeof(DefaultProxyFactoryFactory).AssemblyQualifiedName));
+			Assert.That(cfg.Properties[Environment.ProxyFactoryFactoryClass], Is.EqualTo(typeof(StaticProxyFactoryFactory).AssemblyQualifiedName));
 			Assert.That(cfg.Properties[Environment.Dialect], Is.EqualTo(typeof(MsSql2005Dialect).AssemblyQualifiedName));
 			Assert.That(cfg.Properties[Environment.ConnectionString], Is.EqualTo("Data Source=(local);Initial Catalog=nhibernate;Integrated Security=True"));
 		}

src/NHibernate.Test/Async/DynamicProxyTests/PeVerifyFixture.cs

@@ -35,7 +35,7 @@ public void FullConfiguration()
 			configure.Proxy(p =>
 												{
 													p.Validation = false;
-													p.ProxyFactoryFactory<DefaultProxyFactoryFactory>();
+													p.ProxyFactoryFactory<StaticProxyFactoryFactory>();
 												});
 			configure.Mappings(m=>
 								{
@@ -76,7 +76,7 @@ public void FullConfiguration()
 									Is.EqualTo(typeof(DefaultCollectionTypeFactory).AssemblyQualifiedName));
 			Assert.That(configure.Properties[Environment.UseProxyValidator], Is.EqualTo("false"));
 			Assert.That(configure.Properties[Environment.ProxyFactoryFactoryClass],
-						Is.EqualTo(typeof(DefaultProxyFactoryFactory).AssemblyQualifiedName));
+						Is.EqualTo(typeof(StaticProxyFactoryFactory).AssemblyQualifiedName));
 			Assert.That(configure.Properties[Environment.QueryTranslator],
 						Is.EqualTo(typeof(ASTQueryTranslatorFactory).AssemblyQualifiedName));
 			Assert.That(configure.Properties[Environment.DefaultCatalog], Is.EqualTo("MyCatalog"));

src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs

@@ -1,8 +1,10 @@
+using System;
 using System.Collections;
 using NHibernate.Proxy.DynamicProxy;
 
 namespace NHibernate.Test.DynamicEntity
 {
+	[Obsolete("Require dynamic proxies")]
 	public sealed class DataProxyHandler : Proxy.DynamicProxy.IInterceptor
 	{
 		private readonly Hashtable data = new Hashtable();
@@ -56,4 +58,4 @@ public object Intercept(InvocationInfo info)
 
 		#endregion
 	}
-}
+}

src/NHibernate.Test/CfgTest/Loquacious/LambdaConfigurationFixture.cs

@@ -1,7 +1,10 @@
+using System;
+
 namespace NHibernate.Test.DynamicEntity
 {
+	[Obsolete("Require dynamic proxies")]
 	public interface IProxyMarker
 	{
 		DataProxyHandler DataHandler { get;}
 	}
-}
+}

src/NHibernate.Test/DynamicEntity/DataProxyHandler.cs

@@ -1,10 +1,12 @@
+using System;
 using System.Collections;
 using NHibernate.Cfg;
 using NUnit.Framework;
 
 namespace NHibernate.Test.DynamicEntity.Interceptor
 {
 	[TestFixture]
+	[Obsolete("Require dynamic proxies")]
 	public class InterceptorDynamicEntity : TestCase
 	{
 		protected override string MappingsAssembly
@@ -89,4 +91,4 @@ public void It()
 			session.Close();
 		}
 	}
-}
+}

src/NHibernate.Test/DynamicEntity/IProxyMarker.cs

@@ -1,5 +1,8 @@
+using System;
+
 namespace NHibernate.Test.DynamicEntity.Interceptor
 {
+	[Obsolete("Require dynamic proxies")]
 	public class ProxyInterceptor : EmptyInterceptor
 	{
 		public override string GetEntityName(object entity)
@@ -21,4 +24,4 @@ public override object Instantiate(string entityName, object id)
 			return base.Instantiate(entityName, id);
 		}
 	}
-}
+}

src/NHibernate.Test/DynamicEntity/Interceptor/InterceptorDynamicEntity.cs

@@ -1,7 +1,9 @@
+using System;
 using NHibernate.Proxy.DynamicProxy;
 
 namespace NHibernate.Test.DynamicEntity
 {
+	[Obsolete("Require dynamic proxies")]
 	public class ProxyHelper
 	{
 		private static readonly ProxyFactory proxyGenerator = new ProxyFactory();
@@ -67,4 +69,4 @@ public static string ExtractEntityName(object obj)
 			return null;
 		}
 	}
-}
+}

src/NHibernate.Test/DynamicEntity/Interceptor/ProxyInterceptor.cs

@@ -1,5 +1,8 @@
+using System;
+
 namespace NHibernate.Test.DynamicEntity.Tuplizer
 {
+	[Obsolete("Require dynamic proxies")]
 	public class EntityNameInterceptor : EmptyInterceptor
 	{
 		public override string GetEntityName(object entity)
@@ -8,4 +11,4 @@ public override string GetEntityName(object entity)
 			return entityName;
 		}
 	}
-}
+}