Adjust code according to reviews

To be squashed.

Author: fredericDelaporte

src/NHibernate/Action/BulkOperationCleanupAction.cs

@@ -144,7 +144,5 @@ private void EvictEntityRegions()
 		}
 
 		#endregion
-
-		
 	}
 }

src/NHibernate/Async/Action/BulkOperationCleanupAction.cs

@@ -60,7 +60,5 @@ public Task ExecuteAsync(CancellationToken cancellationToken)
 		}
 
 		#endregion
-
-		
 	}
 }

src/NHibernate/Async/Impl/SessionFactoryImpl.cs

@@ -224,10 +224,8 @@ async Task InternalEvictEntityAsync()
 				{
 					if (log.IsDebugEnabled())
 					{
-						foreach (var p in cacheGroup)
-						{
-							log.Debug("evicting second-level cache: " + p.EntityName);
-						}
+						log.Debug("evicting second-level cache for: {0}",
+					          string.Join(", ", cacheGroup.Select(p => p.EntityName)));
 					}
 					await (cacheGroup.Key.ClearAsync(cancellationToken)).ConfigureAwait(false);
 				}
@@ -325,13 +323,10 @@ async Task InternalEvictCollectionAsync()
 
 				foreach (var cacheGroup in roleNames.Select(GetCollectionPersister).Where(x => x.HasCache).GroupBy(x => x.Cache))
 				{
-				
 					if (log.IsDebugEnabled())
 					{
-						foreach (var p in cacheGroup)
-						{
-							log.Debug("evicting second-level cache: " + p.Role);
-						}
+						log.Debug("evicting second-level cache for: {0}",
+					          string.Join(", ", cacheGroup.Select(p => p.Role)));
 					}
 					await (cacheGroup.Key.ClearAsync(cancellationToken)).ConfigureAwait(false);
 				}

src/NHibernate/Async/Impl/SqlQueryImpl.cs

@@ -121,6 +121,5 @@ protected internal override Task<IEnumerable<ITranslator>> GetTranslatorsAsync(I
 				return Task.FromException<IEnumerable<ITranslator>>(ex);
 			}
 		}
-		
 	}
 }

src/NHibernate/Impl/AbstractQueryImpl.cs

@@ -42,7 +42,7 @@ public abstract partial class AbstractQueryImpl : IQuery
 		private CacheMode? cacheMode;
 		private CacheMode? sessionCacheMode;
 		private string comment;
-		
+
 		protected AbstractQueryImpl(string queryString, FlushMode flushMode, ISessionImplementor session,
 			ParameterMetadata parameterMetadata)
 		{

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -930,10 +930,8 @@ public void EvictEntity(IEnumerable<string> entityNames)
 			{
 				if (log.IsDebugEnabled())
 				{
-					foreach (var p in cacheGroup)
-					{
-						log.Debug("evicting second-level cache: " + p.EntityName);
-					}
+					log.Debug("evicting second-level cache for: {0}",
+					          string.Join(", ", cacheGroup.Select(p => p.EntityName)));
 				}
 				cacheGroup.Key.Clear();
 			}
@@ -1001,13 +999,10 @@ public void EvictCollection(IEnumerable<string> roleNames)
 
 			foreach (var cacheGroup in roleNames.Select(GetCollectionPersister).Where(x => x.HasCache).GroupBy(x => x.Cache))
 			{
-			
 				if (log.IsDebugEnabled())
 				{
-					foreach (var p in cacheGroup)
-					{
-						log.Debug("evicting second-level cache: " + p.Role);
-					}
+					log.Debug("evicting second-level cache for: {0}",
+					          string.Join(", ", cacheGroup.Select(p => p.Role)));
 				}
 				cacheGroup.Key.Clear();
 			}

src/NHibernate/Impl/SqlQueryImpl.cs

@@ -28,8 +28,7 @@ public partial class SqlQueryImpl : AbstractQueryImpl, ISQLQuery
 		private readonly ICollection<string> querySpaces;
 		private readonly bool callable;
 		private bool autoDiscoverTypes;
-		private readonly Lazy<HashSet<string>> addedQuerySpaces = new Lazy<HashSet<string>>(() => new HashSet<string>());
-
+		private readonly HashSet<string> addedQuerySpaces = new HashSet<string>();
 
 		/// <summary> Constructs a SQLQueryImpl given a sql query defined in the mappings. </summary>
 		/// <param name="queryDef">The representation of the defined sql-query. </param>
@@ -172,7 +171,7 @@ public override IList<T> List<T>()
 
 		public NativeSQLQuerySpecification GenerateQuerySpecification(IDictionary<string, TypedValue> parameters)
 		{
-			var allQuerySpaces=new List<string>(GetSynchronizedQuerySpaces());
+			var allQuerySpaces = new List<string>(GetSynchronizedQuerySpaces());
 			if (querySpaces != null)
 			{
 				allQuerySpaces.AddRange(querySpaces);
@@ -330,7 +329,7 @@ protected internal override IEnumerable<ITranslator> GetTranslators(ISessionImpl
 
 		public ISQLQuery AddSynchronizedQuerySpace(string querySpace)
 		{
-			addedQuerySpaces.Value.Add(querySpace);
+			addedQuerySpaces.Add(querySpace);
 			return this;
 		}
 
@@ -339,7 +338,7 @@ public ISQLQuery AddSynchronizedEntityName(string entityName)
 			var persister = session.Factory.GetEntityPersister(entityName);
 			foreach (var querySpace in persister.QuerySpaces)
 			{
-				addedQuerySpaces.Value.Add(querySpace);
+				addedQuerySpaces.Add(querySpace);
 			}
 			return this;
 		}
@@ -349,15 +348,14 @@ public ISQLQuery AddSynchronizedEntityClass(System.Type entityType)
 			var persister = session.Factory.GetEntityPersister(entityType.FullName);
 			foreach (var querySpace in persister.QuerySpaces)
 			{
-				addedQuerySpaces.Value.Add(querySpace);
+				addedQuerySpaces.Add(querySpace);
 			}
 			return this;
 		}
 
 		public IReadOnlyCollection<string> GetSynchronizedQuerySpaces()
 		{
-			return addedQuerySpaces.IsValueCreated ? addedQuerySpaces.Value : new HashSet<string>();
+			return addedQuerySpaces;
 		}
-		
 	}
 }