NH-4027 - Getting rid of an old non generic enumerator by moving to generic.

Author: fredericDelaporte

src/NHibernate/IFilter.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Collections.Generic;
 using NHibernate.Engine;
 
 namespace NHibernate
@@ -10,7 +11,7 @@ namespace NHibernate
 	public interface IFilter
 	{
 		/// <summary>
-		/// Get the name of this filter. 
+		/// Get the name of this filter.
 		/// </summary>
 		/// <returns>This filter's name.</returns>
 		string Name { get; }
@@ -23,34 +24,26 @@ public interface IFilter
 		FilterDefinition FilterDefinition { get; }
 
 		/// <summary>
-		/// Set the named parameter's value list for this filter. 
+		/// Set the named parameter's value list for this filter.
 		/// </summary>
 		/// <param name="name">The parameter's name.</param>
 		/// <param name="value">The values to be applied.</param>
 		/// <returns>This FilterImpl instance (for method chaining).</returns>
 		IFilter SetParameter(string name, object value);
 
 		/// <summary>
-		/// Set the named parameter's value list for this filter.  Used
-		/// in conjunction with IN-style filter criteria.        
+		/// Set the named parameter's value list for this filter. Used
+		/// in conjunction with IN-style filter criteria.
 		/// </summary>
 		/// <param name="name">The parameter's name.</param>
 		/// <param name="values">The values to be expanded into an SQL IN list.</param>
+		/// <typeparam name="T">The type of the values.</typeparam>
 		/// <returns>This FilterImpl instance (for method chaining).</returns>
-		IFilter SetParameterList(string name, ICollection values);
-
-		/// <summary>
-		/// Set the named parameter's value list for this filter.  Used
-		/// in conjunction with IN-style filter criteria.        
-		/// </summary>
-		/// <param name="name">The parameter's name.</param>
-		/// <param name="values">The values to be expanded into an SQL IN list.</param>
-		/// <returns>This FilterImpl instance (for method chaining).</returns>
-		IFilter SetParameterList(string name, object[] values);
+		IFilter SetParameterList<T>(string name, ICollection<T> values);
 
 		/// <summary>
 		/// Perform validation of the filter state.  This is used to verify the
-		/// state of the filter after its enablement and before its use.
+		/// state of the filter after its activation and before its use.
 		/// </summary>
 		/// <returns></returns>
 		void Validate();

src/NHibernate/Impl/EnumerableImpl.cs

@@ -17,8 +17,8 @@ namespace NHibernate.Impl
 	/// <remarks>
 	/// <para>This is the IteratorImpl in H2.0.3</para>
 	/// <para>This thing is scary. It is an <see cref="IEnumerable" /> which returns itself as a <see cref="IEnumerator" />
-	/// when <c>GetEnumerator</c> is called, and EnumerableImpl is disposable. Iterating over it with a <c>foreach</c>
-	/// will cause it to be disposed, probably unexpectedly. (https://stackoverflow.com/a/11179175/1178314)
+	/// when <c>GetEnumerator</c> is called, and <c>EnumerableImpl</c> is disposable. Iterating over it with a <c>foreach</c>
+	/// will cause it to be disposed, probably unexpectedly for the developer. (https://stackoverflow.com/a/11179175/1178314)
 	/// "Fortunately", it does not currently support multiple iterations anyway.</para>
 	/// </remarks>
 	public class EnumerableImpl : IEnumerable, IEnumerator, IDisposable

src/NHibernate/Impl/FilterImpl.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using NHibernate.Engine;
 using NHibernate.Type;
 using System.Collections.Generic;
@@ -76,52 +75,21 @@ public IFilter SetParameter(string name, object value)
 		/// <param name="name">The parameter's name.</param>
 		/// <param name="values">The values to be expanded into an SQL IN list.</param>
 		/// <returns>This FilterImpl instance (for method chaining).</returns>
-		public IFilter SetParameterList(string name, ICollection values)
+		public IFilter SetParameterList<T>(string name, ICollection<T> values)
 		{
-			// Make sure this is a defined parameter and check the incoming value type
-			if (values == null)
-			{
-				throw new ArgumentException("Collection must be not null!", "values");
-			}
-
 			var type = definition.GetParameterType(name);
 			if (type == null)
 			{
 				throw new HibernateException("Undefined filter parameter [" + name + "]");
 			}
 
-			if (values.Count > 0)
+			if (!type.ReturnedClass.IsAssignableFrom(typeof(T)))
 			{
-				var e = values.GetEnumerator();
-				try
-				{
-					e.MoveNext();
-					if (!type.ReturnedClass.IsInstanceOfType(e.Current))
-					{
-						throw new HibernateException("Incorrect type for parameter [" + name + "]");
-					}
-				}
-				finally
-				{
-					// Most enumerators are indeed disposable. foreach takes care of disposing them, but
-					// when using them directly, we have to do it.
-					(e as IDisposable)?.Dispose();
-				}
+				throw new HibernateException("Incorrect type for parameter [" + name + "]");
 			}
-			parameters[name] = values;
-			return this;
-		}
 
-		/// <summary>
-		/// Set the named parameter's value list for this filter.  Used
-		/// in conjunction with IN-style filter criteria.        
-		/// </summary>
-		/// <param name="name">The parameter's name.</param>
-		/// <param name="values">The values to be expanded into an SQL IN list.</param>
-		/// <returns>This FilterImpl instance (for method chaining).</returns>
-		public IFilter SetParameterList(string name, object[] values)
-		{
-			return SetParameterList(name, new List<object>(values));
+			parameters[name] = values ?? throw new ArgumentException("Collection must be not null!", nameof(values));
+			return this;
 		}
 
 		public object GetParameter(string name)

src/NHibernate/Mapping/SimpleValue.cs

@@ -1,6 +1,6 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using NHibernate.Engine;
 using NHibernate.Id;