Fixes after code review

Author: gliljas

src/NHibernate/Async/Engine/BatchFetchQueue.cs

@@ -43,7 +43,7 @@ public async Task<object[]> GetCollectionBatchAsync(ICollectionPersister collect
 
 			if (batchLoadableCollections.TryGetValue(collectionPersister.Role, out var map))
 			{
-				foreach (KeyValuePair<CollectionEntry,IPersistentCollection> me in map)
+				foreach (KeyValuePair<CollectionEntry, IPersistentCollection> me in map)
 				{
 					var ce = me.Key;
 					var collection = me.Value;
@@ -59,11 +59,7 @@ public async Task<object[]> GetCollectionBatchAsync(ICollectionPersister collect
 
 					if (collection.WasInitialized)
 					{
-						// should never happen
-						if (log.IsWarnEnabled())
-						{
-							log.Warn("Encountered initialized collection in BatchFetchQueue, this should not happen.");
-						}
+						log.Warn("Encountered initialized collection in BatchFetchQueue, this should not happen.");
 						continue;
 					}
 
@@ -99,7 +95,7 @@ public async Task<object[]> GetCollectionBatchAsync(ICollectionPersister collect
 					}
 				}
 			}
-			
+
 			return keys; //we ran out of keys to try
 		}
 
@@ -113,7 +109,7 @@ public async Task<object[]> GetCollectionBatchAsync(ICollectionPersister collect
 		/// <param name="batchSize">The maximum number of keys to return</param>
 		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
 		/// <returns>an array of identifiers, of length batchSize (possibly padded with nulls)</returns>
-		public async Task<object[]> GetEntityBatchAsync(IEntityPersister persister,object id,int batchSize, CancellationToken cancellationToken)
+		public async Task<object[]> GetEntityBatchAsync(IEntityPersister persister, object id, int batchSize, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			object[] ids = new object[batchSize];
@@ -122,7 +118,7 @@ public async Task<object[]> GetEntityBatchAsync(IEntityPersister persister,objec
 			int end = -1;
 			bool checkForEnd = false;
 
-			if (batchLoadableEntityKeys.TryGetValue(persister.EntityName,out var set))//TODO: this needn't exclude subclasses...
+			if (batchLoadableEntityKeys.TryGetValue(persister.EntityName, out var set))
 			{
 				foreach (var key in set)
 				{

src/NHibernate/Engine/BatchFetchQueue.cs

@@ -22,15 +22,15 @@ public partial class BatchFetchQueue
 		/// type at a time.
 		/// </remarks>
 		private readonly IDictionary<string, LinkedHashSet<EntityKey>> batchLoadableEntityKeys = new Dictionary<string, LinkedHashSet<EntityKey>>(8);
-		
+
 		/// <summary>
 		/// A map of <see cref="SubselectFetch">subselect-fetch descriptors</see>
 		/// keyed by the <see cref="EntityKey" /> against which the descriptor is
 		/// registered.
 		/// </summary>
 		private readonly IDictionary<EntityKey, SubselectFetch> subselectsByEntityKey = new Dictionary<EntityKey, SubselectFetch>(8);
 
-		private readonly IDictionary<string, LinkedHashMap <CollectionEntry, IPersistentCollection>> batchLoadableCollections = new Dictionary<string, LinkedHashMap<CollectionEntry, IPersistentCollection>>(8);
+		private readonly IDictionary<string, LinkedHashMap<CollectionEntry, IPersistentCollection>> batchLoadableCollections = new Dictionary<string, LinkedHashMap<CollectionEntry, IPersistentCollection>>(8);
 		/// <summary>
 		/// The owning persistence context.
 		/// </summary>
@@ -155,7 +155,7 @@ public void AddBatchLoadableCollection(IPersistentCollection collection, Collect
 				map = new LinkedHashMap<CollectionEntry, IPersistentCollection>();
 				batchLoadableCollections.Add(persister.Role, map);
 			}
-			map[ce]=collection;
+			map[ce] = collection;
 		}
 
 		/// <summary>
@@ -189,7 +189,7 @@ public object[] GetCollectionBatch(ICollectionPersister collectionPersister, obj
 
 			if (batchLoadableCollections.TryGetValue(collectionPersister.Role, out var map))
 			{
-				foreach (KeyValuePair<CollectionEntry,IPersistentCollection> me in map)
+				foreach (KeyValuePair<CollectionEntry, IPersistentCollection> me in map)
 				{
 					var ce = me.Key;
 					var collection = me.Value;
@@ -205,11 +205,7 @@ public object[] GetCollectionBatch(ICollectionPersister collectionPersister, obj
 
 					if (collection.WasInitialized)
 					{
-						// should never happen
-						if (log.IsWarnEnabled())
-						{
-							log.Warn("Encountered initialized collection in BatchFetchQueue, this should not happen.");
-						}
+						log.Warn("Encountered initialized collection in BatchFetchQueue, this should not happen.");
 						continue;
 					}
 
@@ -245,7 +241,7 @@ public object[] GetCollectionBatch(ICollectionPersister collectionPersister, obj
 					}
 				}
 			}
-			
+
 			return keys; //we ran out of keys to try
 		}
 
@@ -258,15 +254,15 @@ public object[] GetCollectionBatch(ICollectionPersister collectionPersister, obj
 		/// <param name="id">The identifier of the entity currently demanding load.</param>
 		/// <param name="batchSize">The maximum number of keys to return</param>
 		/// <returns>an array of identifiers, of length batchSize (possibly padded with nulls)</returns>
-		public object[] GetEntityBatch(IEntityPersister persister,object id,int batchSize)
+		public object[] GetEntityBatch(IEntityPersister persister, object id, int batchSize)
 		{
 			object[] ids = new object[batchSize];
 			ids[0] = id; //first element of array is reserved for the actual instance we are loading!
 			int i = 1;
 			int end = -1;
 			bool checkForEnd = false;
 
-			if (batchLoadableEntityKeys.TryGetValue(persister.EntityName,out var set))//TODO: this needn't exclude subclasses...
+			if (batchLoadableEntityKeys.TryGetValue(persister.EntityName, out var set))
 			{
 				foreach (var key in set)
 				{

src/NHibernate/Engine/StatefulPersistenceContext.cs

@@ -835,7 +835,7 @@ public void AddUninitializedCollection(ICollectionPersister persister, IPersiste
 		{
 			CollectionEntry ce = new CollectionEntry(collection, persister, id, flushing);
 			AddCollection(collection, ce, id);
-			if (persister.BatchSize > 0)
+			if (persister.BatchSize > 1)
 			{
 				batchFetchQueue.AddBatchLoadableCollection(collection, ce);
 			}