Replace IQueryNextVer with an extension method

Author: hazzik

src/NHibernate/Async/Impl/AbstractQueryImpl.cs

@@ -26,7 +26,7 @@
 
 namespace NHibernate.Impl
 {
-	public abstract partial class AbstractQueryImpl : IQuery, IQueryNextVer
+	public abstract partial class AbstractQueryImpl : IQuery
 	{
 
 		#region Execution methods

src/NHibernate/IQuery.cs

@@ -3,20 +3,36 @@
 using NHibernate.Transform;
 using NHibernate.Type;
 using System.Collections.Generic;
+using NHibernate.Impl;
 
 namespace NHibernate
 {
-	// 6.0 TODO add to IQuery
-	internal interface IQueryNextVer : IQuery
+	// 6.0 TODO remove
+	internal static class QueryExtensions
 	{
 		/// <summary>
 		/// Bind a value to a named query parameter
 		/// </summary>
+		/// <param name="query">The query</param>
 		/// <param name="name">The name of the parameter</param>
 		/// <param name="val">The possibly null parameter value</param>
 		/// <param name="type">The NHibernate <see cref="IType"/>.</param>
 		/// <param name="preferMetadataType">If true supplied type is used only if parameter metadata is missing</param>
-		IQuery SetParameter(string name, object val, IType type, bool preferMetadataType);
+		public static void SetParameter(this IQuery query, string name, object val, IType type, bool preferMetadataType)
+		{
+			if (query is AbstractQueryImpl impl)
+			{
+				impl.SetParameter(name, val, type, preferMetadataType);
+			}
+			else
+			{
+				//Let HQL try to process guessed types (hql doesn't support type guessing for NULL) 
+				if (type != null && (preferMetadataType == false || val == null))
+					query.SetParameter(name, val, type);
+				else
+					query.SetParameter(name, val);
+			}
+		}
 	}
 
 	/// <summary>
@@ -677,4 +693,5 @@ public partial interface IQuery
 		/// <returns></returns>
 		IFutureValue<T> FutureValue<T>();
 	}
+	
 }

src/NHibernate/Impl/AbstractQueryImpl.cs

@@ -19,7 +19,7 @@ namespace NHibernate.Impl
 	/// <summary>
 	/// Abstract implementation of the IQuery interface.
 	/// </summary>
-	public abstract partial class AbstractQueryImpl : IQuery, IQueryNextVer
+	public abstract partial class AbstractQueryImpl : IQuery
 	{
 		private readonly string queryString;
 		protected readonly ISessionImplementor session;

src/NHibernate/Linq/DefaultQueryProvider.cs

@@ -253,36 +253,7 @@ protected virtual object ExecuteQuery(NhLinqExpression nhLinqExpression, IQuery
 #pragma warning restore 618
 		}
 
-		//TODO 6.0: Remove
 		private static void SetParameters(IQuery query, IDictionary<string, NamedParameter> parameters)
-		{
-			if (query is IQueryNextVer impl)
-			{
-				SetParameters(impl, parameters);
-				return;
-			}
-			foreach (var parameterName in query.NamedParameters)
-			{
-				// The parameter type will be taken from the parameter metadata
-				var parameter = parameters[parameterName];
-				if (parameter.IsCollection)
-				{
-					query.SetParameterList(parameter.Name, (IEnumerable) parameter.Value);
-				}
-				else
-				{
-					//Let HQL try to process guessed types (hql doesn't support type guessing for NULL) 
-					if (parameter.Type != null && (parameter.IsGuessedType == false || parameter.Value == null))
-						query.SetParameter(parameter.Name, parameter.Value, parameter.Type);
-					else
-						query.SetParameter(parameter.Name, parameter.Value);
-				}
-			}
-		}
-
-		//TODO 6.0: Replace with
-		//private static void SetParameters(IQuery query, IDictionary<string, NamedParameter> parameters)
-		private static void SetParameters(IQueryNextVer query, IDictionary<string, NamedParameter> parameters)
 		{
 			foreach (var parameterName in query.NamedParameters)
 			{