Obsolete EnumerableExtensions

src/NHibernate.Test/Async/NHSpecificTest/NH3050/Fixture.cs

@@ -127,7 +127,7 @@ where personIds.Contains(person.Id)
 				var softReferenceCache = (IEnumerable) field.GetValue(cache);
 
 				// Since the cache only contains one item, the first one will be our key
-				var queryPlanCacheKey = ((DictionaryEntry) softReferenceCache.First()).Key;
+				var queryPlanCacheKey = ((DictionaryEntry) softReferenceCache.Cast<object>().First()).Key;
 
 				// Setup an action that will be run on another thread and that will do nothing more than clearing the cache as long
 				// as the value stored behind the cachekey is not of type ExpandedQueryExpression, which triggers the error.
@@ -172,4 +172,4 @@ where personIds.Contains(person.Id)
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/NHSpecificTest/NH3050/Fixture.cs

@@ -117,7 +117,7 @@ where personIds.Contains(person.Id)
 				var softReferenceCache = (IEnumerable) field.GetValue(cache);
 
 				// Since the cache only contains one item, the first one will be our key
-				var queryPlanCacheKey = ((DictionaryEntry) softReferenceCache.First()).Key;
+				var queryPlanCacheKey = ((DictionaryEntry) softReferenceCache.Cast<object>().First()).Key;
 
 				// Setup an action that will be run on another thread and that will do nothing more than clearing the cache as long
 				// as the value stored behind the cachekey is not of type ExpandedQueryExpression, which triggers the error.
@@ -162,4 +162,4 @@ where personIds.Contains(person.Id)
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/UtilityTest/EnumerableExtensionsTests/AnyExtensionTests.cs

@@ -5,6 +5,8 @@
 
 namespace NHibernate.Test.UtilityTest.EnumerableExtensionsTests
 {
+	//Since v5.1
+	[Obsolete]
 	[TestFixture]
 	public class AnyExtensionTests
 	{
@@ -72,4 +74,4 @@ public void WhenDisposableListThenCallDispose()
 			Assert.That(disposeCalled, Is.True);
 		}
 	}
-}
+}

src/NHibernate.Test/UtilityTest/EnumerableExtensionsTests/FirstExtensionTests.cs

@@ -5,6 +5,8 @@
 
 namespace NHibernate.Test.UtilityTest.EnumerableExtensionsTests
 {
+	//Since v5.1
+	[Obsolete]
 	[TestFixture]
 	public class FirstExtensionTests
 	{

src/NHibernate.Test/UtilityTest/EnumerableExtensionsTests/FirstOrNullExtensionTests.cs

@@ -5,6 +5,8 @@
 
 namespace NHibernate.Test.UtilityTest.EnumerableExtensionsTests
 {
+	//Since v5.1
+	[Obsolete]
 	[TestFixture]
 	public class FirstOrNullExtensionTests
 	{

src/NHibernate/Async/Engine/Cascade.cs

@@ -125,7 +125,7 @@ private Task CascadePropertyAsync(object parent, object child, IType type, Casca
 							{
 								EntityType entityType = (EntityType)type;
 								object loadedValue;
-								if (!componentPathStack.Any())
+								if (componentPathStack.Count == 0)
 								{
 									// association defined on entity
 									loadedValue = entry.GetLoadedValue(propertyName);
@@ -306,4 +306,4 @@ private async Task DeleteOrphansAsync(string entityName, IPersistentCollection p
 			}
 		}
 	}
-}
+}

src/NHibernate/Engine/Cascade.cs

@@ -1,5 +1,5 @@
 using System.Collections;
-
+using System.Collections.Generic;
 using NHibernate.Collection;
 using NHibernate.Event;
 using NHibernate.Persister.Collection;
@@ -76,7 +76,7 @@ public sealed partial class Cascade
 		private readonly IEventSource eventSource;
 		private readonly CascadingAction action;
 
-		private readonly Stack componentPathStack = new Stack();
+		private readonly Stack<string> componentPathStack = new Stack<string>();
 
 		public Cascade(CascadingAction action, CascadePoint point, IEventSource eventSource)
 		{
@@ -172,7 +172,7 @@ private void CascadeProperty(object parent, object child, IType type, CascadeSty
 						{
 							EntityType entityType = (EntityType)type;
 							object loadedValue;
-							if (!componentPathStack.Any())
+							if (componentPathStack.Count == 0)
 							{
 								// association defined on entity
 								loadedValue = entry.GetLoadedValue(propertyName);
@@ -335,4 +335,4 @@ private void DeleteOrphans(string entityName, IPersistentCollection pc)
 			}
 		}
 	}
-}
+}

src/NHibernate/Impl/AbstractQueryImpl.cs

@@ -719,7 +719,7 @@ public IQuery SetParameterList(string name, IEnumerable vals, IType type)
 			{
 				throw new ArgumentNullException("type","Can't determine the type of parameter-list elements.");
 			}
-			if(!vals.Any())
+			if(!vals.Cast<object>().Any())
 			{
 				throw new QueryException(string.Format("An empty parameter-list generates wrong SQL; parameter name '{0}'", name));
 			}
@@ -740,7 +740,7 @@ public IQuery SetParameterList(string name, IEnumerable vals)
 					return this;
 			}
 
-			object firstValue = vals.FirstOrNull();
+			object firstValue = vals.Cast<object>().FirstOrDefault();
 			SetParameterList(name, vals, firstValue == null ? GuessType(vals.GetCollectionElementType()) : DetermineType(name, firstValue));
 
 			return this;

src/NHibernate/Util/EnumerableExtensions.cs

@@ -1,138 +1,43 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace NHibernate.Util
 {
+	//Since v5.1
+	[Obsolete("This class has no more usages and will be removed in next major version.")]
 	public static class EnumerableExtensions
 	{
+		//Since v5.1
+		[Obsolete("Please use Enumerable.Any<T>(IEnumerable<T>) instead.")]
 		public static bool Any(this IEnumerable source)
 		{
-			if (source == null)
-			{
-				throw new ArgumentNullException("source");
-			}
-			using (DisposableEnumerator enumerator = source.GetDisposableEnumerator())
-			{
-				if (enumerator.MoveNext())
-				{
-					return true;
-				}
-			}
-			return false;
+			return Enumerable.Any(source.Cast<object>());
 		}
 
+		//Since v5.1
+		[Obsolete("Please use Enumerable.First<T>(IEnumerable<T>) instead.")]
 		public static object First(this IEnumerable source)
 		{
-			if (source == null)
-			{
-				throw new ArgumentNullException("source");
-			}
-			IList collection = source as IList;
-			if (collection != null)
-			{
-				if (collection.Count > 0)
-				{
-					return collection[0];
-				}
-			}
-			else
-			{
-				using (DisposableEnumerator enumerator = source.GetDisposableEnumerator())
-				{
-					if (enumerator.MoveNext())
-					{
-						return enumerator.Current;
-					}
-				}
-			}
-			throw new InvalidOperationException("Sequence contains no elements");
+			return Enumerable.First(source.Cast<object>());
 		}
 
+		//Since v5.1
+		[Obsolete("Please use Enumerable.FirstOrDefault<T>(IEnumerable<T>) instead.")]
 		public static object FirstOrNull(this IEnumerable source)
 		{
-			if (source == null)
-			{
-				throw new ArgumentNullException("source");
-			}
-			IList collection = source as IList;
-			if (collection != null)
-			{
-				if (collection.Count > 0)
-				{
-					return collection[0];
-				}
-			}
-			else
-			{
-				using (DisposableEnumerator enumerator = source.GetDisposableEnumerator())
-				{
-					if (enumerator.MoveNext())
-					{
-						return enumerator.Current;
-					}
-				}
-			}
-			return null;
+			return Enumerable.FirstOrDefault(source.Cast<object>());
 		}
 
+		//Since v5.1
+		[Obsolete("Please use a loop instead.")]
 		public static void ForEach<T>(this IEnumerable<T> query, Action<T> method)
 		{
-			foreach (T item in query)
+			foreach (var item in query)
 			{
 				method(item);
 			}
 		}
-
-		private static DisposableEnumerator GetDisposableEnumerator(this IEnumerable source)
-		{
-			return new DisposableEnumerator(source);
-		}
-
-		#region Nested type: DisposableEnumerator
-
-		internal class DisposableEnumerator : IDisposable, IEnumerator
-		{
-			private readonly IEnumerator wrapped;
-
-			public DisposableEnumerator(IEnumerable source)
-			{
-				wrapped = source.GetEnumerator();
-			}
-
-			#region IDisposable Members
-
-			public void Dispose()
-			{
-				var disposable = wrapped as IDisposable;
-				if (disposable != null)
-				{
-					disposable.Dispose();
-				}
-			}
-
-			#endregion
-
-			#region IEnumerator Members
-
-			public bool MoveNext()
-			{
-				return wrapped.MoveNext();
-			}
-
-			public void Reset()
-			{
-				wrapped.Reset();
-			}
-
-			public object Current
-			{
-				get { return wrapped.Current; }
-			}
-
-			#endregion
-		}
-
-		#endregion
 	}
-}
+}