Rename Null -> Empty

bahusoid · bahusoid · commit 10a6584fbd33 · 2019-02-22T12:00:56.000+02:00
diff --git a/src/NHibernate/Action/EntityIdentityInsertAction.cs b/src/NHibernate/Action/EntityIdentityInsertAction.cs
@@ -19,7 +19,7 @@ public EntityIdentityInsertAction(object[] state, object instance, IEntityPersis
 			: base(null, state, instance, persister, session)
 		{
 			this.isDelayed = isDelayed;
-			delayedEntityKey = this.isDelayed ? GenerateDelayedEntityKey() : EntityKey.Null;
+			delayedEntityKey = this.isDelayed ? GenerateDelayedEntityKey() : EntityKey.Empty;
 		}
 
 		public object GeneratedId
diff --git a/src/NHibernate/Async/Event/Default/AbstractSaveEventListener.cs b/src/NHibernate/Async/Event/Default/AbstractSaveEventListener.cs
@@ -150,7 +150,7 @@ protected virtual async Task<object> PerformSaveAsync(object entity, object id,
 			}
 			else
 			{
-				key = EntityKey.Null;
+				key = EntityKey.Empty;
 			}
 
 			if (InvokeSaveLifecycle(entity, persister, source))
@@ -184,7 +184,7 @@ protected virtual async Task<object> PerformSaveOrReplicateAsync(object entity,
 			cancellationToken.ThrowIfCancellationRequested();
 			Validate(entity, persister, source);
 
-			object id = key.IsNull ? null : key.Identifier;
+			object id = key.IsEmpty ? null : key.Identifier;
 
 			bool shouldDelayIdentityInserts = !requiresImmediateIdAccess;
 
diff --git a/src/NHibernate/Async/Event/Default/DefaultReplicateEventListener.cs b/src/NHibernate/Async/Event/Default/DefaultReplicateEventListener.cs
@@ -102,7 +102,7 @@ public virtual async Task OnReplicateAsync(ReplicateEvent @event, CancellationTo
 				}
 
 				bool regenerate = persister.IsIdentifierAssignedByInsert; // prefer re-generation of identity!
-				EntityKey key = regenerate ? EntityKey.Null : source.GenerateEntityKey(id, persister);
+				EntityKey key = regenerate ? EntityKey.Empty : source.GenerateEntityKey(id, persister);
 
 				await (PerformSaveOrReplicateAsync(entity, key, persister, regenerate, replicationMode, source, true, cancellationToken)).ConfigureAwait(false);
 			}
diff --git a/src/NHibernate/Async/Impl/MultiCriteriaImpl.cs b/src/NHibernate/Async/Impl/MultiCriteriaImpl.cs
@@ -185,7 +185,7 @@ private async Task GetResultsFromDatabaseAsync(IList results, CancellationToken
 
 							object o =
 								await (loader.GetRowFromResultSetAsync(reader, session, queryParameters, loader.GetLockModes(queryParameters.LockModes),
-																					 EntityKey.Null, hydratedObjects[i], keys, true,
+																					 EntityKey.Empty, hydratedObjects[i], keys, true,
 																					(persister, data) => cacheBatcher.AddToBatch(persister, data), cancellationToken)).ConfigureAwait(false);
 							if (createSubselects[i])
 							{
diff --git a/src/NHibernate/Async/Loader/Loader.cs b/src/NHibernate/Async/Loader/Loader.cs
@@ -118,7 +118,7 @@ protected async Task<object> LoadSingleRowAsync(DbDataReader resultSet, ISession
 			try
 			{
 				result =
-					await (GetRowFromResultSetAsync(resultSet, session, queryParameters, GetLockModes(queryParameters.LockModes), EntityKey.Null,
+					await (GetRowFromResultSetAsync(resultSet, session, queryParameters, GetLockModes(queryParameters.LockModes), EntityKey.Empty,
 										hydratedObjects, new EntityKey[entitySpan], returnProxies, (persister, data) => cacheBatcher.AddToBatch(persister, data), cancellationToken)).ConfigureAwait(false);
 			}
 			catch (OperationCanceledException) { throw; }
@@ -185,7 +185,7 @@ internal async Task<object> GetRowFromResultSetAsync(DbDataReader resultSet, ISe
 				{
 					object entity = row[i];
 					var key = keys[i];
-					if (entity == null && key.IsNotNull && IsChildFetchEntity(i))
+					if (entity == null && key.IsNotEmpty && IsChildFetchEntity(i))
 					{
 						// The entity was missing in the session, fallback on internal load (which will just yield a
 						// proxy if the persister supports it).
@@ -564,7 +564,7 @@ private async Task<EntityKey> GetKeyFromResultSetAsync(int i, IEntityPersister p
 				}
 			}
 
-			return resultId == null ? EntityKey.Null : session.GenerateEntityKey(resultId, persister);
+			return resultId == null ? EntityKey.Empty : session.GenerateEntityKey(resultId, persister);
 		}
 
 		/// <summary>
@@ -620,7 +620,7 @@ private async Task<object[]> GetRowAsync(DbDataReader rs, ILoadable[] persisters
 				object obj = null;
 				EntityKey key = keys[i];
 
-				if (key.IsNull)
+				if (key.IsEmpty)
 				{
 					// do nothing
 					/* TODO NH-1001 : if (persisters[i]...EntityType) is an OneToMany or a ManyToOne and
@@ -756,7 +756,7 @@ private async Task<object> InstanceNotYetLoadedAsync(DbDataReader dr, int i, ILo
 
 			string instanceClass = await (GetInstanceClassAsync(dr, i, persister, key.Identifier, session, cancellationToken)).ConfigureAwait(false);
 
-			if (optionalObjectKey.IsNotNull && key.Equals(optionalObjectKey))
+			if (optionalObjectKey.IsNotEmpty && key.Equals(optionalObjectKey))
 			{
 				// its the given optional object
 				obj = optionalObject;
diff --git a/src/NHibernate/Engine/EntityEntry.cs b/src/NHibernate/Engine/EntityEntry.cs
@@ -215,7 +215,7 @@ public EntityKey EntityKey
 		{
 			get
 			{
-				if (cachedEntityKey.IsNull)
+				if (cachedEntityKey.IsEmpty)
 				{
 					if (id == null)
 						throw new InvalidOperationException("cannot generate an EntityKey when id is null.");
diff --git a/src/NHibernate/Engine/EntityKey.cs b/src/NHibernate/Engine/EntityKey.cs
@@ -6,18 +6,17 @@
 
 namespace NHibernate.Engine
 {
-	//TODO 6.0: Remove IDeserializationCallback interface
 	/// <summary>
 	/// A globally unique identifier of an instance, consisting of the user-visible identifier
 	/// and the identifier space (eg. tablename)
 	/// </summary>
 	[Serializable]
 	public readonly struct EntityKey : ISerializable, IEquatable<EntityKey>
 	{
-		public static EntityKey Null { get; } = new EntityKey();
+		public static EntityKey Empty { get; } = new EntityKey();
 
-		public bool IsNull => identifier == null;
-		public bool IsNotNull => !IsNull;
+		public bool IsEmpty => identifier == null;
+		public bool IsNotEmpty => !IsEmpty;
 
 		private readonly object identifier;
 		private readonly IEntityPersister _persister;
@@ -67,8 +66,8 @@ public override bool Equals(object other)
 
 		public bool Equals(EntityKey other)
 		{
-			if (other.IsNull)
-				return IsNull;
+			if (other.IsEmpty)
+				return IsEmpty;
 
 			return
 				other.RootEntityName.Equals(RootEntityName)
@@ -93,7 +92,7 @@ private static int GenerateHashCode(IEntityPersister persister, object id)
 
 		public override string ToString()
 		{
-			return IsNull
+			return IsEmpty
 				? Util.StringHelper.NullObject 
 				: "EntityKey" + MessageHelper.InfoString(_persister, Identifier, _persister?.Factory);
 		}
@@ -108,9 +107,5 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
 			info.AddValue(nameof(_persister.Factory), _persister.Factory);
 			info.AddValue(nameof(EntityName), EntityName);
 		}
-
-		[Obsolete("IDeserializationCallback interface has no usages and will be removed in a future version")]
-		public void OnDeserialization(object sender)
-		{}
 	}
 }
diff --git a/src/NHibernate/Engine/StatefulPersistenceContext.cs b/src/NHibernate/Engine/StatefulPersistenceContext.cs
@@ -784,7 +784,7 @@ public object NarrowProxy(INHibernateProxy proxy, IEntityPersister persister, in
 		/// </summary>
 		public object ProxyFor(IEntityPersister persister, in EntityKey key, object impl)
 		{
-			if (!persister.HasProxy || key.IsNull)
+			if (!persister.HasProxy || key.IsEmpty)
 				return impl;
 
 			INHibernateProxy proxy;
diff --git a/src/NHibernate/Event/Default/AbstractSaveEventListener.cs b/src/NHibernate/Event/Default/AbstractSaveEventListener.cs
@@ -177,7 +177,7 @@ protected virtual object PerformSave(object entity, object id, IEntityPersister
 			}
 			else
 			{
-				key = EntityKey.Null;
+				key = EntityKey.Empty;
 			}
 
 			if (InvokeSaveLifecycle(entity, persister, source))
@@ -209,7 +209,7 @@ protected virtual object PerformSaveOrReplicate(object entity, EntityKey key, IE
 		{
 			Validate(entity, persister, source);
 
-			object id = key.IsNull ? null : key.Identifier;
+			object id = key.IsEmpty ? null : key.Identifier;
 
 			bool shouldDelayIdentityInserts = !requiresImmediateIdAccess;
 
diff --git a/src/NHibernate/Event/Default/DefaultReplicateEventListener.cs b/src/NHibernate/Event/Default/DefaultReplicateEventListener.cs
@@ -95,7 +95,7 @@ public virtual void OnReplicate(ReplicateEvent @event)
 				}
 
 				bool regenerate = persister.IsIdentifierAssignedByInsert; // prefer re-generation of identity!
-				EntityKey key = regenerate ? EntityKey.Null : source.GenerateEntityKey(id, persister);
+				EntityKey key = regenerate ? EntityKey.Empty : source.GenerateEntityKey(id, persister);
 
 				PerformSaveOrReplicate(entity, key, persister, regenerate, replicationMode, source, true);
 			}
diff --git a/src/NHibernate/Impl/MultiCriteriaImpl.cs b/src/NHibernate/Impl/MultiCriteriaImpl.cs
@@ -258,7 +258,7 @@ private void GetResultsFromDatabase(IList results)
 
 							object o =
 								loader.GetRowFromResultSet(reader, session, queryParameters, loader.GetLockModes(queryParameters.LockModes),
-																					 EntityKey.Null, hydratedObjects[i], keys, true,
+																					 EntityKey.Empty, hydratedObjects[i], keys, true,
 																					(persister, data) => cacheBatcher.AddToBatch(persister, data));
 							if (createSubselects[i])
 							{
diff --git a/src/NHibernate/Loader/Loader.cs b/src/NHibernate/Loader/Loader.cs
@@ -313,7 +313,7 @@ protected object LoadSingleRow(DbDataReader resultSet, ISessionImplementor sessi
 			try
 			{
 				result =
-					GetRowFromResultSet(resultSet, session, queryParameters, GetLockModes(queryParameters.LockModes), EntityKey.Null,
+					GetRowFromResultSet(resultSet, session, queryParameters, GetLockModes(queryParameters.LockModes), EntityKey.Empty,
 										hydratedObjects, new EntityKey[entitySpan], returnProxies, (persister, data) => cacheBatcher.AddToBatch(persister, data));
 			}
 			catch (HibernateException)
@@ -347,7 +347,7 @@ internal static EntityKey GetOptionalObjectKey(QueryParameters queryParameters,
 			}
 			else
 			{
-				return EntityKey.Null;
+				return EntityKey.Empty;
 			}
 		}
 
@@ -392,7 +392,7 @@ internal object GetRowFromResultSet(DbDataReader resultSet, ISessionImplementor
 				{
 					object entity = row[i];
 					var key = keys[i];
-					if (entity == null && key.IsNotNull && IsChildFetchEntity(i))
+					if (entity == null && key.IsNotEmpty && IsChildFetchEntity(i))
 					{
 						// The entity was missing in the session, fallback on internal load (which will just yield a
 						// proxy if the persister supports it).
@@ -567,7 +567,7 @@ private static ISet<EntityKey>[] Transpose(IList<EntityKey[]> keys)
 				for (int i = 0; i < keys.Count; i++)
 				{
 					EntityKey key = keys[i][j];
-					if (key.IsNotNull)
+					if (key.IsNotEmpty)
 					{
 						result[j].Add(key);
 					}
@@ -587,7 +587,7 @@ internal void CreateSubselects(IList<EntityKey[]> keys, QueryParameters queryPar
 				{
 					for (int i = 0; i < rowKeys.Length; i++)
 					{
-						if (rowKeys[i].IsNotNull && subSelects[i] != null)
+						if (rowKeys[i].IsNotEmpty && subSelects[i] != null)
 						{
 							session.PersistenceContext.BatchFetchQueue.AddSubselect(rowKeys[i], subSelects[i]);
 						}
@@ -777,7 +777,7 @@ private void RegisterNonExists(EntityKey[] keys, ISessionImplementor session)
 					if (owner > -1)
 					{
 						EntityKey ownerKey = keys[owner];
-						if (keys[i].IsNull && ownerKey.IsNotNull)
+						if (keys[i].IsEmpty && ownerKey.IsNotEmpty)
 						{
 							bool isOneToOneAssociation = ownerAssociationTypes != null && ownerAssociationTypes[i] != null
 														 && ownerAssociationTypes[i].IsOneToOne;
@@ -913,7 +913,7 @@ private EntityKey GetKeyFromResultSet(int i, IEntityPersister persister, object
 				}
 			}
 
-			return resultId == null ? EntityKey.Null : session.GenerateEntityKey(resultId, persister);
+			return resultId == null ? EntityKey.Empty : session.GenerateEntityKey(resultId, persister);
 		}
 
 		/// <summary>
@@ -967,7 +967,7 @@ private object[] GetRow(DbDataReader rs, ILoadable[] persisters, EntityKey[] key
 				object obj = null;
 				EntityKey key = keys[i];
 
-				if (key.IsNull)
+				if (key.IsEmpty)
 				{
 					// do nothing
 					/* TODO NH-1001 : if (persisters[i]...EntityType) is an OneToMany or a ManyToOne and
@@ -1105,7 +1105,7 @@ private object InstanceNotYetLoaded(DbDataReader dr, int i, ILoadable persister,
 
 			string instanceClass = GetInstanceClass(dr, i, persister, key.Identifier, session);
 
-			if (optionalObjectKey.IsNotNull && key.Equals(optionalObjectKey))
+			if (optionalObjectKey.IsNotEmpty && key.Equals(optionalObjectKey))
 			{
 				// its the given optional object
 				obj = optionalObject;
diff --git a/src/NHibernate/Proxy/AbstractLazyInitializer.cs b/src/NHibernate/Proxy/AbstractLazyInitializer.cs
@@ -231,7 +231,7 @@ private void ErrorIfReadOnlySettingNotAvailable()
 		private static EntityKey GenerateEntityKeyOrNull(object id, ISessionImplementor s, string entityName)
 		{
 			if (id == null || s == null || entityName == null)
-				return EntityKey.Null;
+				return EntityKey.Empty;
 
 			return s.GenerateEntityKey(id, s.Factory.GetEntityPersister(entityName));
 		}
@@ -250,7 +250,7 @@ private void CheckTargetState()
 		private object GetProxyOrNull()
 		{
 			EntityKey entityKey = GenerateEntityKeyOrNull(_id, _session, _entityName);
-			if (entityKey.IsNotNull && _session != null && _session.IsOpen)
+			if (entityKey.IsNotEmpty && _session != null && _session.IsOpen)
 			{
 				return _session.PersistenceContext.GetProxy(entityKey);
 			}
@@ -269,7 +269,7 @@ private void SetReadOnly(bool readOnly)
 			if (initialized)
 			{
 				EntityKey key = GenerateEntityKeyOrNull(_id, _session, _entityName);
-				if (key.IsNotNull && _session.PersistenceContext.ContainsEntity(key))
+				if (key.IsNotEmpty && _session.PersistenceContext.ContainsEntity(key))
 				{
 					_session.PersistenceContext.SetReadOnly(_target, readOnly);
 				}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public EntityIdentityInsertAction(object[] state, object instance, IEntityPersis`
`19`	`19`	`: base(null, state, instance, persister, session)`
`20`	`20`	`{`
`21`	`21`	`this.isDelayed = isDelayed;`
`22`		`- delayedEntityKey = this.isDelayed ? GenerateDelayedEntityKey() : EntityKey.Null;`
	`22`	`+ delayedEntityKey = this.isDelayed ? GenerateDelayedEntityKey() : EntityKey.Empty;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public object GeneratedId`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ protected virtual async Task<object> PerformSaveAsync(object entity, object id,`
`150`	`150`	`}`
`151`	`151`	`else`
`152`	`152`	`{`
`153`		`- key = EntityKey.Null;`
	`153`	`+ key = EntityKey.Empty;`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`if (InvokeSaveLifecycle(entity, persister, source))`
`@@ -184,7 +184,7 @@ protected virtual async Task<object> PerformSaveOrReplicateAsync(object entity,`
`184`	`184`	`cancellationToken.ThrowIfCancellationRequested();`
`185`	`185`	`Validate(entity, persister, source);`
`186`	`186`
`187`		`- object id = key.IsNull ? null : key.Identifier;`
	`187`	`+ object id = key.IsEmpty ? null : key.Identifier;`
`188`	`188`
`189`	`189`	`bool shouldDelayIdentityInserts = !requiresImmediateIdAccess;`
`190`	`190`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public virtual async Task OnReplicateAsync(ReplicateEvent @event, CancellationTo`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`bool regenerate = persister.IsIdentifierAssignedByInsert; // prefer re-generation of identity!`
`105`		`- EntityKey key = regenerate ? EntityKey.Null : source.GenerateEntityKey(id, persister);`
	`105`	`+ EntityKey key = regenerate ? EntityKey.Empty : source.GenerateEntityKey(id, persister);`
`106`	`106`
`107`	`107`	`await (PerformSaveOrReplicateAsync(entity, key, persister, regenerate, replicationMode, source, true, cancellationToken)).ConfigureAwait(false);`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ private async Task GetResultsFromDatabaseAsync(IList results, CancellationToken`
`185`	`185`
`186`	`186`	`object o =`
`187`	`187`	`await (loader.GetRowFromResultSetAsync(reader, session, queryParameters, loader.GetLockModes(queryParameters.LockModes),`
`188`		`- EntityKey.Null, hydratedObjects[i], keys, true,`
	`188`	`+ EntityKey.Empty, hydratedObjects[i], keys, true,`
`189`	`189`	`(persister, data) => cacheBatcher.AddToBatch(persister, data), cancellationToken)).ConfigureAwait(false);`
`190`	`190`	`if (createSubselects[i])`
`191`	`191`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ protected async Task<object> LoadSingleRowAsync(DbDataReader resultSet, ISession`
`118`	`118`	`try`
`119`	`119`	`{`
`120`	`120`	`result =`
`121`		`- await (GetRowFromResultSetAsync(resultSet, session, queryParameters, GetLockModes(queryParameters.LockModes), EntityKey.Null,`
	`121`	`+ await (GetRowFromResultSetAsync(resultSet, session, queryParameters, GetLockModes(queryParameters.LockModes), EntityKey.Empty,`
`122`	`122`	`hydratedObjects, new EntityKey[entitySpan], returnProxies, (persister, data) => cacheBatcher.AddToBatch(persister, data), cancellationToken)).ConfigureAwait(false);`
`123`	`123`	`}`
`124`	`124`	`catch (OperationCanceledException) { throw; }`
`@@ -185,7 +185,7 @@ internal async Task<object> GetRowFromResultSetAsync(DbDataReader resultSet, ISe`
`185`	`185`	`{`
`186`	`186`	`object entity = row[i];`
`187`	`187`	`var key = keys[i];`
`188`		`- if (entity == null && key.IsNotNull && IsChildFetchEntity(i))`
	`188`	`+ if (entity == null && key.IsNotEmpty && IsChildFetchEntity(i))`
`189`	`189`	`{`
`190`	`190`	`// The entity was missing in the session, fallback on internal load (which will just yield a`
`191`	`191`	`// proxy if the persister supports it).`
`@@ -564,7 +564,7 @@ private async Task<EntityKey> GetKeyFromResultSetAsync(int i, IEntityPersister p`
`564`	`564`	`}`
`565`	`565`	`}`
`566`	`566`
`567`		`- return resultId == null ? EntityKey.Null : session.GenerateEntityKey(resultId, persister);`
	`567`	`+ return resultId == null ? EntityKey.Empty : session.GenerateEntityKey(resultId, persister);`
`568`	`568`	`}`
`569`	`569`
`570`	`570`	`/// <summary>`
`@@ -620,7 +620,7 @@ private async Task<object[]> GetRowAsync(DbDataReader rs, ILoadable[] persisters`
`620`	`620`	`object obj = null;`
`621`	`621`	`EntityKey key = keys[i];`
`622`	`622`
`623`		`- if (key.IsNull)`
	`623`	`+ if (key.IsEmpty)`
`624`	`624`	`{`
`625`	`625`	`// do nothing`
`626`	`626`	`/* TODO NH-1001 : if (persisters[i]...EntityType) is an OneToMany or a ManyToOne and`
`@@ -756,7 +756,7 @@ private async Task<object> InstanceNotYetLoadedAsync(DbDataReader dr, int i, ILo`
`756`	`756`
`757`	`757`	`string instanceClass = await (GetInstanceClassAsync(dr, i, persister, key.Identifier, session, cancellationToken)).ConfigureAwait(false);`
`758`	`758`
`759`		`- if (optionalObjectKey.IsNotNull && key.Equals(optionalObjectKey))`
	`759`	`+ if (optionalObjectKey.IsNotEmpty && key.Equals(optionalObjectKey))`
`760`	`760`	`{`
`761`	`761`	`// its the given optional object`
`762`	`762`	`obj = optionalObject;`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ public EntityKey EntityKey`
`215`	`215`	`{`
`216`	`216`	`get`
`217`	`217`	`{`
`218`		`- if (cachedEntityKey.IsNull)`
	`218`	`+ if (cachedEntityKey.IsEmpty)`
`219`	`219`	`{`
`220`	`220`	`if (id == null)`
`221`	`221`	`throw new InvalidOperationException("cannot generate an EntityKey when id is null.");`
Original file line number	Diff line number	Diff line change
`@@ -6,18 +6,17 @@`
`6`	`6`
`7`	`7`	`namespace NHibernate.Engine`
`8`	`8`	`{`
`9`		`- //TODO 6.0: Remove IDeserializationCallback interface`
`10`	`9`	`/// <summary>`
`11`	`10`	`/// A globally unique identifier of an instance, consisting of the user-visible identifier`
`12`	`11`	`/// and the identifier space (eg. tablename)`
`13`	`12`	`/// </summary>`
`14`	`13`	`[Serializable]`
`15`	`14`	`public readonly struct EntityKey : ISerializable, IEquatable<EntityKey>`
`16`	`15`	`{`
`17`		`- public static EntityKey Null { get; } = new EntityKey();`
	`16`	`+ public static EntityKey Empty { get; } = new EntityKey();`
`18`	`17`
`19`		`- public bool IsNull => identifier == null;`
`20`		`- public bool IsNotNull => !IsNull;`
	`18`	`+ public bool IsEmpty => identifier == null;`
	`19`	`+ public bool IsNotEmpty => !IsEmpty;`
`21`	`20`
`22`	`21`	`private readonly object identifier;`
`23`	`22`	`private readonly IEntityPersister _persister;`
`@@ -67,8 +66,8 @@ public override bool Equals(object other)`
`67`	`66`
`68`	`67`	`public bool Equals(EntityKey other)`
`69`	`68`	`{`
`70`		`- if (other.IsNull)`
`71`		`- return IsNull;`
	`69`	`+ if (other.IsEmpty)`
	`70`	`+ return IsEmpty;`
`72`	`71`
`73`	`72`	`return`
`74`	`73`	`other.RootEntityName.Equals(RootEntityName)`
`@@ -93,7 +92,7 @@ private static int GenerateHashCode(IEntityPersister persister, object id)`
`93`	`92`
`94`	`93`	`public override string ToString()`
`95`	`94`	`{`
`96`		`- return IsNull`
	`95`	`+ return IsEmpty`
`97`	`96`	`? Util.StringHelper.NullObject`
`98`	`97`	`: "EntityKey" + MessageHelper.InfoString(_persister, Identifier, _persister?.Factory);`
`99`	`98`	`}`
`@@ -108,9 +107,5 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex`
`108`	`107`	`info.AddValue(nameof(_persister.Factory), _persister.Factory);`
`109`	`108`	`info.AddValue(nameof(EntityName), EntityName);`
`110`	`109`	`}`
`111`		`-`
`112`		`- [Obsolete("IDeserializationCallback interface has no usages and will be removed in a future version")]`
`113`		`- public void OnDeserialization(object sender)`
`114`		`- {}`
`115`	`110`	`}`
`116`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -784,7 +784,7 @@ public object NarrowProxy(INHibernateProxy proxy, IEntityPersister persister, in`
`784`	`784`	`/// </summary>`
`785`	`785`	`public object ProxyFor(IEntityPersister persister, in EntityKey key, object impl)`
`786`	`786`	`{`
`787`		`- if (!persister.HasProxy \|\| key.IsNull)`
	`787`	`+ if (!persister.HasProxy \|\| key.IsEmpty)`
`788`	`788`	`return impl;`
`789`	`789`
`790`	`790`	`INHibernateProxy proxy;`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ protected virtual object PerformSave(object entity, object id, IEntityPersister`
`177`	`177`	`}`
`178`	`178`	`else`
`179`	`179`	`{`
`180`		`- key = EntityKey.Null;`
	`180`	`+ key = EntityKey.Empty;`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`if (InvokeSaveLifecycle(entity, persister, source))`
`@@ -209,7 +209,7 @@ protected virtual object PerformSaveOrReplicate(object entity, EntityKey key, IE`
`209`	`209`	`{`
`210`	`210`	`Validate(entity, persister, source);`
`211`	`211`
`212`		`- object id = key.IsNull ? null : key.Identifier;`
	`212`	`+ object id = key.IsEmpty ? null : key.Identifier;`
`213`	`213`
`214`	`214`	`bool shouldDelayIdentityInserts = !requiresImmediateIdAccess;`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public virtual void OnReplicate(ReplicateEvent @event)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`bool regenerate = persister.IsIdentifierAssignedByInsert; // prefer re-generation of identity!`
`98`		`- EntityKey key = regenerate ? EntityKey.Null : source.GenerateEntityKey(id, persister);`
	`98`	`+ EntityKey key = regenerate ? EntityKey.Empty : source.GenerateEntityKey(id, persister);`
`99`	`99`
`100`	`100`	`PerformSaveOrReplicate(entity, key, persister, regenerate, replicationMode, source, true);`
`101`	`101`	`}`