Apply code suggestions

Co-authored-by: Alex Zaytsev <[email protected]>

Author: fredericDelaporte

src/NHibernate/Async/Cache/StandardQueryCache.cs

@@ -214,8 +214,9 @@ public async Task<IList[]> GetManyAsync(
 					continue;
 				}
 
-				var timestamp = GetResultsMetadata(cacheable, out var aliases); var key = keys[i];
-				if (key.ResultTransformer?.AutoDiscoverTypes == true && HasResults(cacheable))
+				var timestamp = GetResultsMetadata(cacheable, out var aliases);
+				var key = keys[i];
+				if (key.ResultTransformer?.AutoDiscoverTypes == true && !IsEmpty(cacheable))
 				{
 					key.ResultTransformer.SupplyAutoDiscoveredParameters(queryParameters[i].ResultTransformer, aliases);
 				}
@@ -330,7 +331,8 @@ private static async Task<List<object>> GetCacheableResultAsync(
 			ICacheAssembler[] returnTypes,
 			ISessionImplementor session,
 			IList result,
-			long ts, string[] aliases, CancellationToken cancellationToken)
+			long ts,
+			string[] aliases, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			var cacheable =
@@ -360,7 +362,7 @@ private static async Task PerformBeforeAssembleAsync(
 			IList cacheable, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
-			if (!HasResults(cacheable))
+			if (IsEmpty(cacheable))
 				return;
 
 			if (returnTypes.Length == 1)
@@ -392,7 +394,7 @@ private async Task<IList> PerformAssembleAsync(
 			try
 			{
 				var result = new List<object>(cacheable.Count - 1);
-				if (!HasResults(cacheable))
+				if (IsEmpty(cacheable))
 					return result;
 
 				if (returnTypes.Length == 1)
@@ -449,7 +451,7 @@ private static async Task InitializeCollectionsAsync(
 			IList cacheResult, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
-			if (!HasResults(cacheResult))
+			if (IsEmpty(cacheResult))
 				return;
 
 			var collectionIndexes = new Dictionary<int, ICollectionPersister>();
@@ -491,7 +493,7 @@ private async Task<IList> GetResultFromCacheableAsync(
 			cancellationToken.ThrowIfCancellationRequested();
 			Log.Debug("returning cached query results for: {0}", key);
 
-			if (!HasResults(cacheable))
+			if (IsEmpty(cacheable))
 				return new List<object>();
 
 			returnTypes = GetReturnTypes(key, returnTypes, cacheable);

src/NHibernate/Cache/StandardQueryCache.cs

@@ -249,8 +249,9 @@ public IList[] GetMany(
 					continue;
 				}
 
-				var timestamp = GetResultsMetadata(cacheable, out var aliases); var key = keys[i];
-				if (key.ResultTransformer?.AutoDiscoverTypes == true && HasResults(cacheable))
+				var timestamp = GetResultsMetadata(cacheable, out var aliases);
+				var key = keys[i];
+				if (key.ResultTransformer?.AutoDiscoverTypes == true && !IsEmpty(cacheable))
 				{
 					key.ResultTransformer.SupplyAutoDiscoveredParameters(queryParameters[i].ResultTransformer, aliases);
 				}
@@ -371,7 +372,8 @@ private static List<object> GetCacheableResult(
 			ICacheAssembler[] returnTypes,
 			ISessionImplementor session,
 			IList result,
-			long ts, string[] aliases)
+			long ts,
+			string[] aliases)
 		{
 			var cacheable =
 				new List<object>(result.Count + 1)
@@ -407,9 +409,9 @@ private static long GetResultsMetadata(IList cacheable, out string[] aliases)
 			return (long) metadataArray[0];
 		}
 
-		private static bool HasResults(IList cacheable)
+		private static bool IsEmpty(IList cacheable)
 			// First element is the timestamp.
-			=> cacheable.Count > 1;
+			=> cacheable.Count <= 1;
 
 		private static IEnumerable<object> GetResultsEnumerable(IList cacheable)
 		{
@@ -425,7 +427,7 @@ private static ICacheAssembler[] GetReturnTypes(
 			ICacheAssembler[] returnTypes,
 			IList cacheable)
 		{
-			var hasResults = HasResults(cacheable);
+			var hasResults = !IsEmpty(cacheable);
 			if (key.ResultTransformer?.AutoDiscoverTypes == true && hasResults)
 			{
 				returnTypes = GuessTypes(cacheable);
@@ -444,7 +446,7 @@ private static void PerformBeforeAssemble(
 			ISessionImplementor session,
 			IList cacheable)
 		{
-			if (!HasResults(cacheable))
+			if (IsEmpty(cacheable))
 				return;
 
 			if (returnTypes.Length == 1)
@@ -475,7 +477,7 @@ private IList PerformAssemble(
 			try
 			{
 				var result = new List<object>(cacheable.Count - 1);
-				if (!HasResults(cacheable))
+				if (IsEmpty(cacheable))
 					return result;
 
 				if (returnTypes.Length == 1)
@@ -531,7 +533,7 @@ private static void InitializeCollections(
 			IList assembleResult,
 			IList cacheResult)
 		{
-			if (!HasResults(cacheResult))
+			if (IsEmpty(cacheResult))
 				return;
 
 			var collectionIndexes = new Dictionary<int, ICollectionPersister>();
@@ -572,7 +574,7 @@ private IList GetResultFromCacheable(
 		{
 			Log.Debug("returning cached query results for: {0}", key);
 
-			if (!HasResults(cacheable))
+			if (IsEmpty(cacheable))
 				return new List<object>();
 
 			returnTypes = GetReturnTypes(key, returnTypes, cacheable);