Eliminate usage of protected field uniqueKeyPropertyName.

Author: ngbrown

src/NHibernate/Async/Type/EntityType.cs

@@ -65,12 +65,12 @@ protected internal async Task<object> GetReferenceValueAsync(object value, ISess
 			else
 			{
 				IEntityPersister entityPersister = session.Factory.GetEntityPersister(GetAssociatedEntityName());
-				object propertyValue = entityPersister.GetPropertyValue(value, uniqueKeyPropertyName);
+				object propertyValue = entityPersister.GetPropertyValue(value, _uniqueKeyPropertyName);
 
 				// We now have the value of the property-ref we reference.  However,
 				// we need to dig a little deeper, as that property might also be
 				// an entity type, in which case we need to resolve its identitifier
-				IType type = entityPersister.GetPropertyType(uniqueKeyPropertyName);
+				IType type = entityPersister.GetPropertyType(_uniqueKeyPropertyName);
 				if (type.IsEntityType)
 				{
 					propertyValue = await (((EntityType) type).GetReferenceValueAsync(propertyValue, session, cancellationToken)).ConfigureAwait(false);
@@ -190,7 +190,7 @@ public override Task<object> ResolveIdentifierAsync(object value, ISessionImplem
 				}
 				else
 				{
-					return LoadByUniqueKeyAsync(GetAssociatedEntityName(), uniqueKeyPropertyName, value, session, cancellationToken);
+					return LoadByUniqueKeyAsync(GetAssociatedEntityName(), _uniqueKeyPropertyName, value, session, cancellationToken);
 				}
 			}
 			catch (Exception ex)

src/NHibernate/Type/EntityType.cs

@@ -17,8 +17,11 @@ namespace NHibernate.Type
 	[Serializable]
 	public abstract partial class EntityType : AbstractType, IAssociationType
 	{
+		// Since v5.1
+		[Obsolete("This field has no more usages in NHibernate and will be removed.  Use RHSUniqueKeyPropertyName instead.")]
 		protected readonly string uniqueKeyPropertyName;
 
+		private readonly string _uniqueKeyPropertyName;
 		private readonly bool _eager;
 		private readonly string _associatedEntityName;
 		private readonly bool _unwrapProxy;
@@ -38,8 +41,12 @@ public abstract partial class EntityType : AbstractType, IAssociationType
 		/// </param>
 		protected internal EntityType(string entityName, string uniqueKeyPropertyName, bool eager, bool unwrapProxy)
 		{
-			_associatedEntityName = entityName;
+#pragma warning disable 618
 			this.uniqueKeyPropertyName = uniqueKeyPropertyName;
+#pragma warning restore 618
+
+			_associatedEntityName = entityName;
+			_uniqueKeyPropertyName = uniqueKeyPropertyName;
 			_eager = eager;
 			_unwrapProxy = unwrapProxy;
 		}
@@ -163,12 +170,12 @@ protected internal object GetReferenceValue(object value, ISessionImplementor se
 			else
 			{
 				IEntityPersister entityPersister = session.Factory.GetEntityPersister(GetAssociatedEntityName());
-				object propertyValue = entityPersister.GetPropertyValue(value, uniqueKeyPropertyName);
+				object propertyValue = entityPersister.GetPropertyValue(value, _uniqueKeyPropertyName);
 
 				// We now have the value of the property-ref we reference.  However,
 				// we need to dig a little deeper, as that property might also be
 				// an entity type, in which case we need to resolve its identitifier
-				IType type = entityPersister.GetPropertyType(uniqueKeyPropertyName);
+				IType type = entityPersister.GetPropertyType(_uniqueKeyPropertyName);
 				if (type.IsEntityType)
 				{
 					propertyValue = ((EntityType) type).GetReferenceValue(propertyValue, session);
@@ -272,7 +279,7 @@ public sealed override object NullSafeGet(DbDataReader rs, string[] names, ISess
 
 		public bool IsUniqueKeyReference
 		{
-			get { return uniqueKeyPropertyName != null; }
+			get { return _uniqueKeyPropertyName != null; }
 		}
 
 		public abstract bool IsNullable { get; }
@@ -300,7 +307,7 @@ public IType GetIdentifierOrUniqueKeyType(IMapping factory)
 			}
 			else
 			{
-				IType type = factory.GetReferencedPropertyType(GetAssociatedEntityName(), uniqueKeyPropertyName);
+				IType type = factory.GetReferencedPropertyType(GetAssociatedEntityName(), _uniqueKeyPropertyName);
 				if (type.IsEntityType)
 				{
 					type = ((EntityType) type).GetIdentifierOrUniqueKeyType(factory);
@@ -322,7 +329,7 @@ public string GetIdentifierOrUniqueKeyPropertyName(IMapping factory)
 			}
 			else
 			{
-				return uniqueKeyPropertyName;
+				return _uniqueKeyPropertyName;
 			}
 		}
 
@@ -387,7 +394,7 @@ public override object ResolveIdentifier(object value, ISessionImplementor sessi
 			}
 			else
 			{
-				return LoadByUniqueKey(GetAssociatedEntityName(), uniqueKeyPropertyName, value, session);
+				return LoadByUniqueKey(GetAssociatedEntityName(), _uniqueKeyPropertyName, value, session);
 			}
 		}
 
@@ -420,7 +427,7 @@ public string GetAssociatedEntityName()
 
 		public string LHSPropertyName => null;
 
-		public string RHSUniqueKeyPropertyName => uniqueKeyPropertyName;
+		public string RHSUniqueKeyPropertyName => _uniqueKeyPropertyName;
 
 		public virtual string PropertyName => null;
 
@@ -448,7 +455,7 @@ public override int GetHashCode(object x, ISessionFactoryImplementor factory)
 
 		public abstract bool IsAlwaysDirtyChecked { get; }
 
-		public bool IsReferenceToPrimaryKey => string.IsNullOrEmpty(uniqueKeyPropertyName);
+		public bool IsReferenceToPrimaryKey => string.IsNullOrEmpty(_uniqueKeyPropertyName);
 
 		public string GetOnCondition(string alias, ISessionFactoryImplementor factory, IDictionary<string, IFilter> enabledFilters)
 		{

src/NHibernate/Type/ManyToOneType.cs

@@ -97,7 +97,7 @@ public override object Hydrate(DbDataReader rs, string[] names, ISessionImplemen
 		private void ScheduleBatchLoadIfNeeded(object id, ISessionImplementor session)
 		{
 			//cannot batch fetch by unique key (property-ref associations)
-			if (uniqueKeyPropertyName == null && id != null)
+			if (RHSUniqueKeyPropertyName == null && id != null)
 			{
 				IEntityPersister persister = session.Factory.GetEntityPersister(GetAssociatedEntityName());
 				EntityKey entityKey = session.GenerateEntityKey(id, persister);