Removing dep to NH Core's ProxyFactory.

Removing IEnversProxyFactory completely,
now using hand written proxies instead.

Author: RogerKratz

Src/NHibernate.Envers.Tests/NetSpecific/Integration/Configuration/Serialize/InterfaceImplementationVerificationTest.cs

@@ -15,7 +15,6 @@ public class InterfaceImplementationVerificationTest
 		private readonly System.Type[] serializableInterfaces =
 		{
 			typeof (ICollectionMapperFactory),
-			typeof (IEnversProxyFactory),
 			typeof (IRevisionInfoGenerator),
 			typeof (IPropertyMapper),
 			typeof (IIdMapper),

Src/NHibernate.Envers.Tests/NetSpecific/Integration/CustomMapping/UserCollection/CustomCollectionMapperFactory.cs

@@ -5,9 +5,9 @@ namespace NHibernate.Envers.Tests.NetSpecific.Integration.CustomMapping.UserColl
 {
 	public class CustomCollectionMapperFactory : ICustomCollectionMapperFactory
 	{
-		public IPropertyMapper Create(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentDatabool, bool embeddableElementType)
+		public IPropertyMapper Create(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentDatabool, bool embeddableElementType)
 		{
-			return new SpecialMapper(enversProxyFactory, commonCollectionMapperData, elementComponentData, embeddableElementType);
+			return new SpecialMapper(commonCollectionMapperData, elementComponentData, embeddableElementType);
 		}
 	}
 }

Src/NHibernate.Envers.Tests/NetSpecific/Integration/CustomMapping/UserCollection/SpecialMapper.cs

@@ -9,8 +9,8 @@ public class SpecialMapper : BagCollectionMapper<Number>
 	{
 		private readonly MiddleComponentData _elementComponentData;
 
-		public SpecialMapper(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, bool embeddableElementType)
-			: base(enversProxyFactory, commonCollectionMapperData, typeof(ISpecialCollection), elementComponentData, embeddableElementType)
+		public SpecialMapper(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, bool embeddableElementType)
+			: base(commonCollectionMapperData, typeof(ISpecialCollection), elementComponentData, embeddableElementType)
 		{
 			_elementComponentData = elementComponentData;
 		}

Src/NHibernate.Envers.Tests/NetSpecific/UnitTests/CustomLists/CustomListTests.cs

@@ -36,9 +36,9 @@ public void TestCustomLists()
 
 	internal class CustomCollectionMapperFactory<TItem> : ICustomCollectionMapperFactory
 	{
-		public IPropertyMapper Create(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, bool embeddableElementType)
+		public IPropertyMapper Create(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, bool embeddableElementType)
 		{
-			return new CustomListCollectionMapper<CustomList<TItem>, TItem>(enversProxyFactory, commonCollectionMapperData, typeof(CustomList<TItem>), elementComponentData, indexComponentData, embeddableElementType);
+			return new CustomListCollectionMapper<CustomList<TItem>, TItem>(commonCollectionMapperData, typeof(CustomList<TItem>), elementComponentData, indexComponentData, embeddableElementType);
 		}
 	}
 
@@ -49,13 +49,12 @@ public class CustomListCollectionMapper<TCustomList, TItem> : AbstractCollection
 		private readonly MiddleComponentData _elementComponentData;
 		private readonly MiddleComponentData _indexComponentData;
 
-		public CustomListCollectionMapper(IEnversProxyFactory enversProxyFactory,
-									CommonCollectionMapperData commonCollectionMapperData,
+		public CustomListCollectionMapper(CommonCollectionMapperData commonCollectionMapperData,
 									System.Type proxyType,
 									MiddleComponentData elementComponentData,
 									MiddleComponentData indexComponentData,
 									bool revisionTypeInId)
-			: base(enversProxyFactory, commonCollectionMapperData, proxyType, false, revisionTypeInId)
+			: base(commonCollectionMapperData, proxyType, false, revisionTypeInId)
 		{
 			_elementComponentData = elementComponentData;
 			_indexComponentData = indexComponentData;

Src/NHibernate.Envers.Tests/NetSpecific/UnitTests/Fluent/Model/SomeCollectionMapper.cs

@@ -5,7 +5,7 @@ namespace NHibernate.Envers.Tests.NetSpecific.UnitTests.Fluent.Model
 {
 	public class SomeCollectionMapper : ICustomCollectionMapperFactory
 	{
-		public IPropertyMapper Create(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, bool embeddableElementType)
+		public IPropertyMapper Create(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, bool embeddableElementType)
 		{
 			return null;
 		}

Src/NHibernate.Envers/Configuration/ConfigurationKey.cs

@@ -74,12 +74,6 @@ public static readonly StringConfigurationEntry DefaultCatalog
 		public static readonly TypeConfigurationEntry CollectionMapperFactory
 			= new TypeConfigurationEntry("nhibernate.envers.collection_mapper_factory", typeof(DefaultCollectionMapperFactory).AssemblyQualifiedName);
 
-		/// <summary>
-		/// Resposible to create envers proxies.
-		/// </summary>
-		public static readonly TypeConfigurationEntry ProxyFactory
-			= new TypeConfigurationEntry("nhibernate.envers.proxy_factory", typeof(DefaultEnversProxyFactory).AssemblyQualifiedName);
-
 		/// <summary>
 		/// String that will be appended to the name of an audited
 		/// entity to create the name of the entity, that will hold

Src/NHibernate.Envers/Configuration/GlobalConfiguration.cs

@@ -18,7 +18,6 @@ public GlobalConfiguration(AuditConfiguration auditConfiguration, IDictionary<st
 			IsTrackEntitiesChangedInRevisionEnabled = ConfigurationKey.TrackEntitiesChangedInRevision.ToBool(properties);
 			DefaultSchemaName = ConfigurationKey.DefaultSchema.ToString(properties);
 			DefaultCatalogName = ConfigurationKey.DefaultCatalog.ToString(properties);
-			EnversProxyFactory = ConfigurationKey.ProxyFactory.ToInstance<IEnversProxyFactory>(properties);
 			CollectionMapperFactory = ConfigurationKey.CollectionMapperFactory.ToInstance<ICollectionMapperFactory>(properties);
 			CorrelatedSubqueryOperator = "=";
 			IsGlobalWithModifiedFlag = ConfigurationKey.GlobalWithModifiedFlag.ToBool(properties);
@@ -72,7 +71,6 @@ public void SetTrackEntitiesChangedInRevisionEnabled()
 		public string DefaultCatalogName { get; }
 
 		public ICollectionMapperFactory CollectionMapperFactory { get; }
-		public IEnversProxyFactory EnversProxyFactory { get; }
 
 		public bool IsGlobalWithModifiedFlag { get; }
 		public string ModifiedFlagSuffix { get; }

Src/NHibernate.Envers/Configuration/Metadata/CollectionMetadataGenerator.cs

@@ -37,13 +37,13 @@ public sealed class CollectionMetadataGenerator
 		/// </summary>
 		private readonly string _referencedEntityName;
 
-		private static readonly MethodInfo sortedSetDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.SortedSet<object>(null, null, null, null, false));
-		private static readonly MethodInfo setDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.Set<object>(null, null, null, false));
-		private static readonly MethodInfo bagDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.Bag<object>(null, null, null, false));
-		private static readonly MethodInfo idBagDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.IdBag<object>(null, null, null, false));
-		private static readonly MethodInfo listDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.List<object>(null, null, null, null, false));
-		private static readonly MethodInfo sortedMapDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.SortedMap<object, object>(null, null, null, null, null, false));
-		private static readonly MethodInfo mapDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.Map<object, object>(null, null, null, null, false));
+		private static readonly MethodInfo sortedSetDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.SortedSet<object>(null, null, null, false));
+		private static readonly MethodInfo setDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.Set<object>(null, null, false));
+		private static readonly MethodInfo bagDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.Bag<object>(null, null, false));
+		private static readonly MethodInfo idBagDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.IdBag<object>(null, null, false));
+		private static readonly MethodInfo listDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.List<object>(null, null, null, false));
+		private static readonly MethodInfo sortedMapDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.SortedMap<object, object>(null, null, null, null, false));
+		private static readonly MethodInfo mapDefinition = ReflectHelper.GetMethodDefinition<ICollectionMapperFactory>(x => x.Map<object, object>(null, null, null, false));
 
 		/// <summary>
 		/// Ctor
@@ -504,55 +504,55 @@ private void addMapper(CommonCollectionMapperData commonCollectionMapperData, Mi
 
 			if (_propertyAuditingData.CustomCollectionMapperFactory != null)
 			{
-				collectionMapper = _propertyAuditingData.CustomCollectionMapperFactory.Create(_mainGenerator.GlobalCfg.EnversProxyFactory, commonCollectionMapperData, elementComponentData, indexComponentData, embeddableElementType);
+				collectionMapper = _propertyAuditingData.CustomCollectionMapperFactory.Create(commonCollectionMapperData, elementComponentData, indexComponentData, embeddableElementType);
 			}
 			else if (propertyValueType == typeof(Set))
 			{
 				if (_propertyValue.IsSorted)
 				{
 					var methodInfo = sortedSetDefinition.MakeGenericMethod(type.ReturnedClass.GetGenericArguments());
 					collectionMapper = (IPropertyMapper)methodInfo.Invoke(collectionProxyMapperFactory,
-						new[] { _mainGenerator.GlobalCfg.EnversProxyFactory, commonCollectionMapperData, elementComponentData, _propertyValue.Comparer, embeddableElementType });
+						new[] { commonCollectionMapperData, elementComponentData, _propertyValue.Comparer, embeddableElementType });
 				}
 				else
 				{
 					var methodInfo = setDefinition.MakeGenericMethod(type.ReturnedClass.GetGenericArguments());
 					collectionMapper = (IPropertyMapper)methodInfo.Invoke(collectionProxyMapperFactory,
-						new object[] { _mainGenerator.GlobalCfg.EnversProxyFactory, commonCollectionMapperData, elementComponentData, embeddableElementType });
+						new object[] { commonCollectionMapperData, elementComponentData, embeddableElementType });
 				}
 			}
 			else if (propertyValueType == typeof(List))
 			{
 				var methodInfo = listDefinition.MakeGenericMethod(type.ReturnedClass.GetGenericArguments());
 				collectionMapper = (IPropertyMapper)methodInfo.Invoke(collectionProxyMapperFactory,
-					new object[] { _mainGenerator.GlobalCfg.EnversProxyFactory, commonCollectionMapperData, elementComponentData, indexComponentData, embeddableElementType });
+					new object[] { commonCollectionMapperData, elementComponentData, indexComponentData, embeddableElementType });
 			}
 			else if (propertyValueType == typeof (Map))
 			{
 				if (_propertyValue.IsSorted)
 				{
 					var methodInfo = sortedMapDefinition.MakeGenericMethod(type.ReturnedClass.GetGenericArguments());
 					collectionMapper = (IPropertyMapper)methodInfo.Invoke(collectionProxyMapperFactory,
-						new[] { _mainGenerator.GlobalCfg.EnversProxyFactory, commonCollectionMapperData, elementComponentData, indexComponentData, _propertyValue.Comparer, embeddableElementType });
+						new[] { commonCollectionMapperData, elementComponentData, indexComponentData, _propertyValue.Comparer, embeddableElementType });
 				}
 				else
 				{
 					var methodInfo = mapDefinition.MakeGenericMethod(type.ReturnedClass.GetGenericArguments());
 					collectionMapper = (IPropertyMapper)methodInfo.Invoke(collectionProxyMapperFactory,
-						new object[] { _mainGenerator.GlobalCfg.EnversProxyFactory, commonCollectionMapperData, elementComponentData, indexComponentData, embeddableElementType });
+						new object[] { commonCollectionMapperData, elementComponentData, indexComponentData, embeddableElementType });
 				}
 			}
 			else if (propertyValueType == typeof(Bag))
 			{
 				var methodInfo = bagDefinition.MakeGenericMethod(type.ReturnedClass.GetGenericArguments());
 				collectionMapper = (IPropertyMapper)methodInfo.Invoke(collectionProxyMapperFactory,
-					new object[] { _mainGenerator.GlobalCfg.EnversProxyFactory, commonCollectionMapperData, elementComponentData, embeddableElementType });
+					new object[] { commonCollectionMapperData, elementComponentData, embeddableElementType });
 			}
 			else if (propertyValueType == typeof(IdentifierBag))
 			{
 				var methodInfo = idBagDefinition.MakeGenericMethod(type.ReturnedClass.GetGenericArguments());
 				collectionMapper = (IPropertyMapper)methodInfo.Invoke(collectionProxyMapperFactory,
-					new object[] { _mainGenerator.GlobalCfg.EnversProxyFactory, commonCollectionMapperData, elementComponentData, embeddableElementType });
+					new object[] { commonCollectionMapperData, elementComponentData, embeddableElementType });
 			}
 			else
 			{

Src/NHibernate.Envers/Configuration/Metadata/DefaultCollectionMapperFactory.cs

@@ -2,61 +2,51 @@
 using System.Collections.Generic;
 using NHibernate.Envers.Entities.Mapper;
 using NHibernate.Envers.Entities.Mapper.Relation;
+using NHibernate.Envers.Entities.Mapper.Relation.Lazy.Proxy;
 
 namespace NHibernate.Envers.Configuration.Metadata
 {
 	[Serializable]
 	public class DefaultCollectionMapperFactory : ICollectionMapperFactory
 	{
-		public virtual IPropertyMapper Array(IEnversProxyFactory enversProxyFactory, System.Type elementType, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, bool embeddableElementType)
+		public virtual IPropertyMapper Array(System.Type elementType, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, bool embeddableElementType)
 		{
 			throw new NotImplementedException("Array is not supported by DefaultCollectionMapperFactory");
 		}
 
-		public virtual IPropertyMapper IdBag<T>(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, bool embeddableElementType)
+		public virtual IPropertyMapper IdBag<T>(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, bool embeddableElementType)
 		{
-			return new IdBagCollectionMapper<T>(enversProxyFactory, commonCollectionMapperData, typeof(IList<T>), elementComponentData, embeddableElementType);
+			return new IdBagCollectionMapper<T>(commonCollectionMapperData, typeof(ListProxy<T>), elementComponentData, embeddableElementType);
 		}
 
-		public virtual IPropertyMapper Set<T>(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, bool embeddableElementType)
+		public virtual IPropertyMapper Set<T>(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, bool embeddableElementType)
 		{
-			return new SetCollectionMapper<T>(enversProxyFactory,
-			                                  commonCollectionMapperData,
-			                                  typeof (ISet<T>),
-			                                  elementComponentData,
-			                                  embeddableElementType,
-			                                  embeddableElementType);
+			return new SetCollectionMapper<T>(commonCollectionMapperData, typeof (SetProxy<T>), elementComponentData, embeddableElementType, embeddableElementType);
 		}
 
-		public virtual IPropertyMapper SortedSet<T>(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, IComparer<T> comparer, bool embeddableElementType)
+		public virtual IPropertyMapper SortedSet<T>(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, IComparer<T> comparer, bool embeddableElementType)
 		{
-			return new SortedSetCollectionMapper<T>(enversProxyFactory,
-											commonCollectionMapperData,
-											typeof(ISet<T>),
-											elementComponentData,
-											comparer, 
-											embeddableElementType,
-											embeddableElementType);
+			return new SortedSetCollectionMapper<T>(commonCollectionMapperData, typeof(SetProxy<T>), elementComponentData, comparer, embeddableElementType, embeddableElementType);
 		}
 
-		public virtual IPropertyMapper List<T>(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, bool embeddableElementType)
+		public virtual IPropertyMapper List<T>(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, bool embeddableElementType)
 		{
-			return new ListCollectionMapper<T>(enversProxyFactory, commonCollectionMapperData, typeof(IList<T>), elementComponentData, indexComponentData, embeddableElementType);
+			return new ListCollectionMapper<T>(commonCollectionMapperData, typeof(ListProxy<T>), elementComponentData, indexComponentData, embeddableElementType);
 		}
 
-		public virtual IPropertyMapper Map<TKey, TValue>(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, bool embeddableElementType)
+		public virtual IPropertyMapper Map<TKey, TValue>(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, bool embeddableElementType)
 		{
-			return new MapCollectionMapper<TKey, TValue>(enversProxyFactory, commonCollectionMapperData, typeof(IDictionary<TKey, TValue>), elementComponentData, indexComponentData, embeddableElementType);
+			return new MapCollectionMapper<TKey, TValue>(commonCollectionMapperData, typeof(DictionaryProxy<TKey, TValue>), elementComponentData, indexComponentData, embeddableElementType);
 		}
 
-		public virtual IPropertyMapper SortedMap<TKey, TValue>(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, IComparer<TKey> comparer, bool embeddableElementType)
+		public virtual IPropertyMapper SortedMap<TKey, TValue>(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, MiddleComponentData indexComponentData, IComparer<TKey> comparer, bool embeddableElementType)
 		{
-			return new SortedMapCollectionMapper<TKey, TValue>(enversProxyFactory, commonCollectionMapperData, typeof(IDictionary<TKey, TValue>), elementComponentData, indexComponentData, comparer, embeddableElementType);
+			return new SortedMapCollectionMapper<TKey, TValue>(commonCollectionMapperData, typeof(DictionaryProxy<TKey, TValue>), elementComponentData, indexComponentData, comparer, embeddableElementType);
 		}
 
-		public virtual IPropertyMapper Bag<T>(IEnversProxyFactory enversProxyFactory, CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, bool embeddableElementType)
+		public virtual IPropertyMapper Bag<T>(CommonCollectionMapperData commonCollectionMapperData, MiddleComponentData elementComponentData, bool embeddableElementType)
 		{
-			return new BagCollectionMapper<T>(enversProxyFactory, commonCollectionMapperData, typeof(IList<T>), elementComponentData, embeddableElementType);
+			return new BagCollectionMapper<T>(commonCollectionMapperData, typeof(ListProxy<T>), elementComponentData, embeddableElementType);
 		}
 	}
 }