NH-3722 - Remove EntityMode.Xml related properties from ICollectionPersister

hazzik · hazzik · commit fba9c79a63aa · 2017-03-27T09:14:10.000+13:00
* Ported HHH-7736 from hibernate/hibernate-orm@1a5bdd9
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ current-test-configuration
 # to satisfy later build steps. But it should not be committed.
 NHibernate.dll
 TestResult.xml
+.vscode
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2568/UsageOfCustomCollectionPersisterTests.cs b/src/NHibernate.Test/NHSpecificTest/NH2568/UsageOfCustomCollectionPersisterTests.cs
@@ -46,6 +46,6 @@ public void BuildingSessionFactoryShouldNotThrows()
 
 	public class MyCollectionPersister: OneToManyPersister
 	{
-		public MyCollectionPersister(Mapping.Collection collection, ICacheConcurrencyStrategy cache, Configuration cfg, ISessionFactoryImplementor factory) : base(collection, cache, cfg, factory) {}
+		public MyCollectionPersister(Mapping.Collection collection, ICacheConcurrencyStrategy cache, ISessionFactoryImplementor factory) : base(collection, cache, factory) {}
 	}
 }
diff --git a/src/NHibernate.Test/NHSpecificTest/SetFixture.cs b/src/NHibernate.Test/NHSpecificTest/SetFixture.cs
@@ -378,21 +378,6 @@ public bool IsMutable
 			get { throw new NotImplementedException(); }
 		}
 
-		public string NodeName
-		{
-			get { throw new NotImplementedException(); }
-		}
-
-		public string ElementNodeName
-		{
-			get { throw new NotImplementedException(); }
-		}
-
-		public string IndexNodeName
-		{
-			get { throw new NotImplementedException(); }
-		}
-
 		#endregion
 	}
 
diff --git a/src/NHibernate/Impl/SessionFactoryImpl.cs b/src/NHibernate/Impl/SessionFactoryImpl.cs
@@ -276,7 +276,7 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 				{
 					allCacheRegions[cache.RegionName] = cache.Cache;
 				}
-				ICollectionPersister persister = PersisterFactory.CreateCollectionPersister(cfg, model, cache, this);
+				ICollectionPersister persister = PersisterFactory.CreateCollectionPersister(model, cache, this);
 				collectionPersisters[model.Role] = persister;
 				IType indexType = persister.IndexType;
 				if (indexType != null && indexType.IsAssociationType && !indexType.IsAnyType)
diff --git a/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs b/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs
@@ -8,7 +8,6 @@
 using NHibernate.AdoNet;
 using NHibernate.Cache;
 using NHibernate.Cache.Entry;
-using NHibernate.Cfg;
 using NHibernate.Collection;
 using NHibernate.Engine;
 using NHibernate.Exceptions;
@@ -52,9 +51,6 @@ public abstract class AbstractCollectionPersister : ICollectionMetadata, ISqlLoa
 		private readonly bool hasOrder;
 		private readonly bool hasWhere;
 		private readonly int baseIndex;
-		private readonly string nodeName;
-		private readonly string elementNodeName;
-		private readonly string indexNodeName;
 
 		protected internal bool indexContainsFormula;
 		protected internal bool elementIsPureFormula;
@@ -165,8 +161,7 @@ public abstract class AbstractCollectionPersister : ICollectionMetadata, ISqlLoa
 
 		private static readonly IInternalLogger log = LoggerProvider.LoggerFor(typeof (ICollectionPersister));
 
-		public AbstractCollectionPersister(Mapping.Collection collection, ICacheConcurrencyStrategy cache, Configuration cfg,
-										   ISessionFactoryImplementor factory)
+		public AbstractCollectionPersister(Mapping.Collection collection, ICacheConcurrencyStrategy cache, ISessionFactoryImplementor factory)
 		{
 			this.factory = factory;
 			this.cache = cache;
@@ -188,7 +183,6 @@ public AbstractCollectionPersister(Mapping.Collection collection, ICacheConcurre
 			entityName = collection.OwnerEntityName;
 			ownerPersister = factory.GetEntityPersister(entityName);
 			queryLoaderName = collection.LoaderName;
-			nodeName = collection.NodeName;
 			isMutable = collection.IsMutable;
 
 			Table table = collection.CollectionTable;
@@ -277,22 +271,16 @@ public AbstractCollectionPersister(Mapping.Collection collection, ICacheConcurre
 				CheckColumnDuplication(distinctColumns, element.ColumnIterator);
 			}
 
-			string elemNode = collection.ElementNodeName;
 			if (elementType.IsEntityType)
 			{
 				string _entityName = ((EntityType) elementType).GetAssociatedEntityName();
 				elementPersister = factory.GetEntityPersister(_entityName);
-				if (elemNode == null)
-				{
-					elemNode = cfg.GetClassMapping(_entityName).NodeName;
-				}
 				// NativeSQL: collect element column and auto-aliases
 			}
 			else
 			{
 				elementPersister = null;
 			}
-			elementNodeName = elemNode;
 
 			int elementSpan = element.ColumnSpan;
 			elementColumnAliases = new string[elementSpan];
@@ -377,7 +365,6 @@ public AbstractCollectionPersister(Mapping.Collection collection, ICacheConcurre
 				indexContainsFormula = hasFormula;
 				baseIndex = indexedCollection.IsList ? ((List) indexedCollection).BaseIndex : 0;
 
-				indexNodeName = indexedCollection.IndexNodeName;
 				CheckColumnDuplication(distinctColumns, indexedCollection.Index.ColumnIterator);
 			}
 			else
@@ -390,7 +377,6 @@ public AbstractCollectionPersister(Mapping.Collection collection, ICacheConcurre
 				indexColumnNames = null;
 				indexColumnAliases = null;
 				baseIndex = 0;
-				indexNodeName = null;
 			}
 
 			hasIdentifier = collection.IsIdentified;
@@ -1937,21 +1923,6 @@ public bool IsVersioned
 			get { return isVersioned && OwnerEntityPersister.IsVersioned; }
 		}
 
-		public string NodeName
-		{
-			get { return nodeName; }
-		}
-
-		public string ElementNodeName
-		{
-			get { return elementNodeName; }
-		}
-
-		public string IndexNodeName
-		{
-			get { return indexNodeName; }
-		}
-
 		protected virtual ISQLExceptionConverter SQLExceptionConverter
 		{
 			get { return sqlExceptionConverter; }
diff --git a/src/NHibernate/Persister/Collection/BasicCollectionPersister.cs b/src/NHibernate/Persister/Collection/BasicCollectionPersister.cs
@@ -3,7 +3,6 @@
 using System.Data.Common;
 using NHibernate.AdoNet;
 using NHibernate.Cache;
-using NHibernate.Cfg;
 using NHibernate.Collection;
 using NHibernate.Engine;
 using NHibernate.Exceptions;
@@ -23,8 +22,8 @@ namespace NHibernate.Persister.Collection
 	/// </summary>
 	public class BasicCollectionPersister : AbstractCollectionPersister
 	{
-		public BasicCollectionPersister(Mapping.Collection collection, ICacheConcurrencyStrategy cache, Configuration cfg, ISessionFactoryImplementor factory) 
-			: base(collection, cache, cfg, factory) { }
+		public BasicCollectionPersister(Mapping.Collection collection, ICacheConcurrencyStrategy cache, ISessionFactoryImplementor factory) 
+			: base(collection, cache, factory) { }
 
 		public override bool CascadeDeleteEnabled
 		{
diff --git a/src/NHibernate/Persister/Collection/ICollectionPersister.cs b/src/NHibernate/Persister/Collection/ICollectionPersister.cs
@@ -130,12 +130,6 @@ public interface ICollectionPersister
 		/// <summary> Can the elements of this collection change?</summary>
 		bool IsMutable { get;}
 
-		string NodeName { get;}
-
-		string ElementNodeName { get;}
-
-		string IndexNodeName { get;}
-
 		ISessionFactoryImplementor Factory { get; }
 		bool IsExtraLazy { get;}
 
diff --git a/src/NHibernate/Persister/Collection/OneToManyPersister.cs b/src/NHibernate/Persister/Collection/OneToManyPersister.cs
@@ -5,7 +5,6 @@
 using System.Text;
 using NHibernate.AdoNet;
 using NHibernate.Cache;
-using NHibernate.Cfg;
 using NHibernate.Collection;
 using NHibernate.Engine;
 using NHibernate.Exceptions;
@@ -24,8 +23,8 @@ public class OneToManyPersister : AbstractCollectionPersister
 		private readonly bool _keyIsNullable;
 		private readonly bool _keyIsUpdateable;
 
-		public OneToManyPersister(Mapping.Collection collection, ICacheConcurrencyStrategy cache, Configuration cfg, ISessionFactoryImplementor factory)
-			: base(collection, cache, cfg, factory)
+		public OneToManyPersister(Mapping.Collection collection, ICacheConcurrencyStrategy cache, ISessionFactoryImplementor factory)
+			: base(collection, cache, factory)
 		{
 			_cascadeDeleteEnabled = collection.Key.IsCascadeDeleteEnabled && factory.Dialect.SupportsCascadeDelete;
 			_keyIsNullable = collection.Key.IsNullable;
diff --git a/src/NHibernate/Persister/PersisterFactory.cs b/src/NHibernate/Persister/PersisterFactory.cs
@@ -2,7 +2,6 @@
 using System.Reflection;
 using System.Text;
 using NHibernate.Cache;
-using NHibernate.Cfg;
 using NHibernate.Engine;
 using NHibernate.Mapping;
 using NHibernate.Persister.Collection;
@@ -18,30 +17,19 @@ public static class PersisterFactory
 		//TODO: make ClassPersisters *not* depend on ISessionFactoryImplementor
 		// interface, if possible
 
-		private static readonly System.Type[] PersisterConstructorArgs = new System.Type[]
-			{
-				typeof(PersistentClass),
-				typeof(ICacheConcurrencyStrategy),
-				typeof(ISessionFactoryImplementor),
-				typeof(IMapping)
-			};
-
-		// TODO: is it really necessary to provide Configuration to CollectionPersisters ? Should it not be enough with associated class ?
-		// or why does ClassPersister's not get access to configuration ?
-		private static readonly System.Type[] CollectionPersisterConstructorArgs = new System.Type[]
-			{
-				typeof(Mapping.Collection),
-				typeof(ICacheConcurrencyStrategy),
-				typeof(ISessionFactoryImplementor)
-			};
+		static readonly System.Type[] PersisterConstructorArgs = {
+			typeof(PersistentClass),
+			typeof(ICacheConcurrencyStrategy),
+			typeof(ISessionFactoryImplementor),
+			typeof(IMapping)
+		};
 
-		private static readonly System.Type[] CollectionPersisterConstructor2Args = new System.Type[]
-			{
-				typeof(Mapping.Collection),
-				typeof(ICacheConcurrencyStrategy),
-				typeof(Configuration),
-				typeof(ISessionFactoryImplementor)
-			};
+		static readonly System.Type[] CollectionPersisterConstructorArgs =
+		{
+			typeof(Mapping.Collection),
+			typeof(ICacheConcurrencyStrategy),
+			typeof(ISessionFactoryImplementor)
+		};
 
 		/// <summary>
 		/// Creates a built in Entity Persister or a custom Persister.
@@ -69,7 +57,7 @@ public static IEntityPersister CreateClassPersister(PersistentClass model, ICach
 			}
 		}
 
-		public static ICollectionPersister CreateCollectionPersister(Configuration cfg, Mapping.Collection model, ICacheConcurrencyStrategy cache,
+		public static ICollectionPersister CreateCollectionPersister(Mapping.Collection model, ICacheConcurrencyStrategy cache,
 																	 ISessionFactoryImplementor factory)
 		{
 			System.Type persisterClass = model.CollectionPersisterClass;
@@ -78,12 +66,12 @@ public static ICollectionPersister CreateCollectionPersister(Configuration cfg,
 				// default behaviour
 				return
 					model.IsOneToMany
-						? (ICollectionPersister) new OneToManyPersister(model, cache, cfg, factory)
-						: (ICollectionPersister) new BasicCollectionPersister(model, cache, cfg, factory);
+						? (ICollectionPersister) new OneToManyPersister(model, cache, factory)
+						: (ICollectionPersister) new BasicCollectionPersister(model, cache, factory);
 			}
 			else
 			{
-				return Create(persisterClass, model, cache, factory, cfg);
+				return Create(persisterClass, model, cache, factory);
 			}
 		}
 
@@ -127,18 +115,12 @@ public static IEntityPersister Create(System.Type persisterClass, PersistentClas
 		}
 
 		public static ICollectionPersister Create(System.Type persisterClass, Mapping.Collection model,
-												  ICacheConcurrencyStrategy cache, ISessionFactoryImplementor factory, Configuration cfg)
+												  ICacheConcurrencyStrategy cache, ISessionFactoryImplementor factory)
 		{
 			ConstructorInfo pc;
-			var use4Parameters = false;
 			try
 			{
 				pc = persisterClass.GetConstructor(CollectionPersisterConstructorArgs);
-				if (pc == null)
-				{
-					use4Parameters = true;
-					pc = persisterClass.GetConstructor(CollectionPersisterConstructor2Args);
-				}
 			}
 			catch (Exception e)
 			{
@@ -147,21 +129,14 @@ public static ICollectionPersister Create(System.Type persisterClass, Mapping.Co
 			if(pc == null)
 			{
 				var messageBuilder = new StringBuilder();
-				messageBuilder.AppendLine("Could not find a public constructor for " + persisterClass.Name +";");
-				messageBuilder.AppendLine("- The ctor may have " + CollectionPersisterConstructorArgs.Length + " parameters of types (in order):");
+				messageBuilder.Append("Could not find a public constructor for ").Append(persisterClass.Name).AppendLine(";");
+				messageBuilder.Append("- The ctor may have ").Append(CollectionPersisterConstructorArgs.Length).AppendLine(" parameters of types (in order):");
 				System.Array.ForEach(CollectionPersisterConstructorArgs, t=> messageBuilder.AppendLine(t.FullName));
-				messageBuilder.AppendLine();
-				messageBuilder.AppendLine("- The ctor may have " + CollectionPersisterConstructor2Args.Length + " parameters of types (in order):");
-				System.Array.ForEach(CollectionPersisterConstructor2Args, t => messageBuilder.AppendLine(t.FullName));
 				throw new MappingException(messageBuilder.ToString());
 			}
 			try
 			{
-				if (!use4Parameters)
-				{
-					return (ICollectionPersister) pc.Invoke(new object[] {model, cache, factory});
-				}
-				return (ICollectionPersister)pc.Invoke(new object[] { model, cache, cfg, factory });
+				return (ICollectionPersister) pc.Invoke(new object[] {model, cache, factory});
 			}
 			catch (TargetInvocationException tie)
 			{

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ public void BuildingSessionFactoryShouldNotThrows()`
`46`	`46`
`47`	`47`	`public class MyCollectionPersister: OneToManyPersister`
`48`	`48`	`{`
`49`		`- public MyCollectionPersister(Mapping.Collection collection, ICacheConcurrencyStrategy cache, Configuration cfg, ISessionFactoryImplementor factory) : base(collection, cache, cfg, factory) {}`
	`49`	`+ public MyCollectionPersister(Mapping.Collection collection, ICacheConcurrencyStrategy cache, ISessionFactoryImplementor factory) : base(collection, cache, factory) {}`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings`
`276`	`276`	`{`
`277`	`277`	`allCacheRegions[cache.RegionName] = cache.Cache;`
`278`	`278`	`}`
`279`		`- ICollectionPersister persister = PersisterFactory.CreateCollectionPersister(cfg, model, cache, this);`
	`279`	`+ ICollectionPersister persister = PersisterFactory.CreateCollectionPersister(model, cache, this);`
`280`	`280`	`collectionPersisters[model.Role] = persister;`
`281`	`281`	`IType indexType = persister.IndexType;`
`282`	`282`	`if (indexType != null && indexType.IsAssociationType && !indexType.IsAnyType)`