Big fat renaming (no other changes)

bahusoid · bahusoid · commit c44cf1fc74c3 · 2018-06-06T10:48:46.000+03:00
diff --git a/src/NHibernate.Test/Async/Futures/MultiAnyQuerytBatchFixture.cs b/src/NHibernate.Test/Async/Futures/MultiAnyQuerytBatchFixture.cs
@@ -94,9 +94,9 @@ public async Task CanFetchCollectionInBatchAsync()
 				var q1 = session.QueryOver<EntityComplex>()
 								.Where(x => x.Version >= 0);
 
-				batch.Add(new MultiAnyCriteriaQuery<object>(q1.RootCriteria));
+				batch.Add(new CriteriaBatchItem<object>(q1.RootCriteria));
 
-				batch.Add(new MultiAnyLinqQuery<EntityComplex>(session.Query<EntityComplex>().Fetch(c => c.ChildrenList)));
+				batch.Add(new LinqBatchItem<EntityComplex>(session.Query<EntityComplex>().Fetch(c => c.ChildrenList)));
 				await (batch.ExecuteAsync());
 				var parent = await (session.LoadAsync<EntityComplex>(_parentId));
 				Assert.That(NHibernateUtil.IsInitialized(parent), Is.True);
@@ -341,10 +341,10 @@ protected override void OnSetUp()
 			}
 		}
 
-		private static MultiAnyQueryBatch NewBatch(ISession session)
+		private static QueryBatch NewBatch(ISession session)
 		{
 			var si = session.GetSessionImplementation();
-			var batch = new MultiAnyQueryBatch(si);
+			var batch = new QueryBatch(si);
 			return batch;
 		}
 
diff --git a/src/NHibernate.Test/Futures/MultiAnyQuerytBatchFixture.cs b/src/NHibernate.Test/Futures/MultiAnyQuerytBatchFixture.cs
@@ -83,9 +83,9 @@ public void CanFetchCollectionInBatch()
 				var q1 = session.QueryOver<EntityComplex>()
 								.Where(x => x.Version >= 0);
 
-				batch.Add(new MultiAnyCriteriaQuery<object>(q1.RootCriteria));
+				batch.Add(new CriteriaBatchItem<object>(q1.RootCriteria));
 
-				batch.Add(new MultiAnyLinqQuery<EntityComplex>(session.Query<EntityComplex>().Fetch(c => c.ChildrenList)));
+				batch.Add(new LinqBatchItem<EntityComplex>(session.Query<EntityComplex>().Fetch(c => c.ChildrenList)));
 				batch.Execute();
 				var parent = session.Load<EntityComplex>(_parentId);
 				Assert.That(NHibernateUtil.IsInitialized(parent), Is.True);
@@ -330,10 +330,10 @@ protected override void OnSetUp()
 			}
 		}
 
-		private static MultiAnyQueryBatch NewBatch(ISession session)
+		private static QueryBatch NewBatch(ISession session)
 		{
 			var si = session.GetSessionImplementation();
-			var batch = new MultiAnyQueryBatch(si);
+			var batch = new QueryBatch(si);
 			return batch;
 		}
 
diff --git a/src/NHibernate/Async/Linq/DefaultQueryProvider.cs b/src/NHibernate/Async/Linq/DefaultQueryProvider.cs
@@ -28,7 +28,7 @@ public partial interface INhQueryProvider : IQueryProvider
 		Task<int> ExecuteDmlAsync<T>(QueryMode queryMode, Expression expression, CancellationToken cancellationToken);
 	}
 
-	public partial class DefaultQueryProvider : INhQueryProvider, IQueryProviderWithOptions, INhQueryProviderSupportMultiBatch
+	public partial class DefaultQueryProvider : INhQueryProvider, IQueryProviderWithOptions, ISupportFutureBatchNhQueryProvider
 	{
 
 		// Since v5.1
diff --git a/src/NHibernate/Async/Multi/CriteriaBatchItem.cs b/src/NHibernate/Async/Multi/CriteriaBatchItem.cs
@@ -17,7 +17,7 @@ namespace NHibernate
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial class MultiAnyCriteriaQuery<T> : MultiAnyQueryBase<T>
+	public partial class CriteriaBatchItem<T> : QueryBatchItemBase<T>
 	{
 
 		protected override Task<IList<T>> ExecuteQueryNowAsync(CancellationToken cancellationToken = default(CancellationToken))
diff --git a/src/NHibernate/Async/Multi/IQueryBatch.cs b/src/NHibernate/Async/Multi/IQueryBatch.cs
@@ -12,7 +12,7 @@ namespace NHibernate
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial interface IMultiAnyQueryBatch
+	public partial interface IQueryBatch
 	{
 		/// <summary>
 		/// Executes batch
diff --git a/src/NHibernate/Async/Multi/IQueryBatchItem.cs b/src/NHibernate/Async/Multi/IQueryBatchItem.cs
@@ -19,7 +19,7 @@ namespace NHibernate
 	using System.Threading.Tasks;
 	using System.Threading;
 
-	public partial interface IMultiAnyQuery
+	public partial interface IQueryBatchItem
 	{
 
 		/// <summary>
diff --git a/src/NHibernate/Async/Multi/LinqBatchItem.cs b/src/NHibernate/Async/Multi/LinqBatchItem.cs
@@ -21,7 +21,7 @@ namespace NHibernate
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial class MultiAnyLinqQuery<T> : MultiAnyQuery<T>
+	public partial class LinqBatchItem<T> : QueryBatchItem<T>
 	{
 
 		protected override async Task<IList<T>> ExecuteQueryNowAsync(CancellationToken cancellationToken = default(CancellationToken))
diff --git a/src/NHibernate/Async/Multi/QueryBatch.cs b/src/NHibernate/Async/Multi/QueryBatch.cs
@@ -21,7 +21,7 @@ namespace NHibernate
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial class MultiAnyQueryBatch : IMultiAnyQueryBatch
+	public partial class QueryBatch : IQueryBatch
 	{
 
 		/// <inheritdoc />
diff --git a/src/NHibernate/Async/Multi/QueryBatchItem.cs b/src/NHibernate/Async/Multi/QueryBatchItem.cs
@@ -17,7 +17,7 @@ namespace NHibernate
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public partial class MultiAnyQuery<TResult> : MultiAnyQueryBase<TResult>
+	public partial class QueryBatchItem<TResult> : QueryBatchItemBase<TResult>
 	{
 
 		protected override Task<IList<TResult>> ExecuteQueryNowAsync(CancellationToken cancellationToken = default(CancellationToken))
diff --git a/src/NHibernate/Async/Multi/QueryBatchItemBase.cs b/src/NHibernate/Async/Multi/QueryBatchItemBase.cs
@@ -23,7 +23,7 @@ namespace NHibernate
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	public abstract partial class MultiAnyQueryBase<TResult> : IMultiAnyQuery<TResult>
+	public abstract partial class QueryBatchItemBase<TResult> : IQueryBatchItem<TResult>
 	{
 
 		public async Task PostProcessAsync(CancellationToken cancellationToken = default(CancellationToken))
diff --git a/src/NHibernate/Engine/ISessionImplementor.cs b/src/NHibernate/Engine/ISessionImplementor.cs
@@ -36,9 +36,9 @@ internal static IDisposable BeginProcess(this ISessionImplementor session)
 				new SessionIdLoggingContext(session.SessionId);
 		}
 
-		internal static IMultiAnyQueryBatch GetFutureMultiBatch(this ISessionImplementor session)
+		internal static IQueryBatch GetFutureBatch(this ISessionImplementor session)
 		{
-			return (session as AbstractSessionImpl)?.FutureMultiBatch;
+			return (session as AbstractSessionImpl)?.FutureBatch;
 		}
 
 		internal static void AutoFlushIfRequired(this ISessionImplementor implementor, ISet<string> querySpaces)
diff --git a/src/NHibernate/Impl/AbstractQueryImpl.cs b/src/NHibernate/Impl/AbstractQueryImpl.cs
@@ -903,12 +903,12 @@ public IQuery SetResultTransformer(IResultTransformer transformer)
 
 		public IFutureEnumerable<T> Future<T>()
 		{
-			return session.GetFutureMultiBatch().AddAsEnumerable<T>(this);
+			return session.GetFutureBatch().AddAsEnumerable<T>(this);
 		}
 
 		public IFutureValue<T> FutureValue<T>()
 		{
-			return session.GetFutureMultiBatch().AddAsValue<T>(this);
+			return session.GetFutureBatch().AddAsValue<T>(this);
 		}
 
 		/// <summary> Override the current session cache mode, just for this query.
diff --git a/src/NHibernate/Impl/AbstractSessionImpl.cs b/src/NHibernate/Impl/AbstractSessionImpl.cs
@@ -31,7 +31,7 @@ public abstract partial class AbstractSessionImpl : ISessionImplementor
 		private FlushMode _flushMode;
 
 		[NonSerialized]
-		private IMultiAnyQueryBatch _futureMultiBatch;
+		private IQueryBatch _futureMultiBatch;
 
 		private bool closed;
 
@@ -288,9 +288,9 @@ public virtual IQuery GetNamedSQLQuery(string name)
 		[Obsolete("Replaced by FutureBatch")]
 		public abstract FutureQueryBatch FutureQueryBatch { get; protected internal set; }
 	
-		public virtual IMultiAnyQueryBatch FutureMultiBatch
+		public virtual IQueryBatch FutureBatch
 		{
-			get => _futureMultiBatch ?? (_futureMultiBatch = new MultiAnyQueryBatch(this));
+			get => _futureMultiBatch ?? (_futureMultiBatch = new QueryBatch(this));
 		}
 
 		public virtual IInterceptor Interceptor { get; protected set; }
diff --git a/src/NHibernate/Impl/CriteriaImpl.cs b/src/NHibernate/Impl/CriteriaImpl.cs
@@ -457,12 +457,12 @@ public ICriteria CreateCriteria(string associationPath, string alias, JoinType j
 
 		public IFutureValue<T> FutureValue<T>()
 		{
-			return session.GetFutureMultiBatch().AddAsValue<T>(this);
+			return session.GetFutureBatch().AddAsValue<T>(this);
 		}
 
 		public IFutureEnumerable<T> Future<T>()
 		{
-			return session.GetFutureMultiBatch().AddAsEnumerable<T>(this);
+			return session.GetFutureBatch().AddAsEnumerable<T>(this);
 		}
 
 		public object UniqueResult()
diff --git a/src/NHibernate/Impl/FutureBatch.cs b/src/NHibernate/Impl/FutureBatch.cs
@@ -7,7 +7,7 @@
 namespace NHibernate.Impl
 {
 	//Since 5.2
-	[Obsolete("Replaced by MultiAnyQueryBatch")]
+	[Obsolete("Replaced by QueryBatch")]
 	public abstract partial class FutureBatch<TQueryApproach, TMultiApproach>
 	{
 		private class BatchedQuery
diff --git a/src/NHibernate/Impl/FutureCriteriaBatch.cs b/src/NHibernate/Impl/FutureCriteriaBatch.cs
@@ -4,7 +4,7 @@
 namespace NHibernate.Impl
 {
 	//Since 5.2
-	[Obsolete("Replaced by MultiAnyQueryBatch")]
+	[Obsolete("Replaced by QueryBatch")]
 	public partial class FutureCriteriaBatch : FutureBatch<ICriteria, IMultiCriteria>
 	{
 		public FutureCriteriaBatch(SessionImpl session) : base(session) {}
diff --git a/src/NHibernate/Impl/FutureQueryBatch.cs b/src/NHibernate/Impl/FutureQueryBatch.cs
@@ -5,7 +5,7 @@
 namespace NHibernate.Impl
 {
 	//Since 5.2
-	[Obsolete("Replaced by MultiAnyQueryBatch")]
+	[Obsolete("Replaced by QueryBatch")]
 	public partial class FutureQueryBatch : FutureBatch<IQuery, IMultiQuery>
 	{
 		public FutureQueryBatch(SessionImpl session) : base(session)
diff --git a/src/NHibernate/Impl/SessionImpl.cs b/src/NHibernate/Impl/SessionImpl.cs
@@ -206,7 +206,7 @@ internal SessionImpl(SessionFactoryImpl factory, ISessionCreationOptions options
 		}
 
 		//Since 5.2
-		[Obsolete("Replaced by MultiAnyQueryBatch")]
+		[Obsolete("Replaced by QueryBatch")]
 		public override FutureCriteriaBatch FutureCriteriaBatch
 		{
 			get
@@ -222,7 +222,7 @@ protected internal set
 		}
 
 		//Since 5.2
-		[Obsolete("Replaced by MultiAnyQueryBatch")]
+		[Obsolete("Replaced by QueryBatch")]
 		public override FutureQueryBatch FutureQueryBatch
 		{
 			get
diff --git a/src/NHibernate/Impl/StatelessSessionImpl.cs b/src/NHibernate/Impl/StatelessSessionImpl.cs
@@ -856,15 +856,15 @@ public override int ExecuteUpdate(IQueryExpression queryExpression, QueryParamet
 		}
 
 		//Since 5.2
-		[Obsolete("Replaced by MultiAnyQueryBatch")]
+		[Obsolete("Replaced by QueryBatch")]
 		public override FutureCriteriaBatch FutureCriteriaBatch
 		{
 			get { throw new NotSupportedException("future queries are not supported for stateless session"); }
 			protected internal set { throw new NotSupportedException("future queries are not supported for stateless session"); }
 		}
 
 		//Since 5.2
-		[Obsolete("Replaced by MultiAnyQueryBatch")]
+		[Obsolete("Replaced by QueryBatch")]
 		public override FutureQueryBatch FutureQueryBatch
 		{
 			get { throw new NotSupportedException("future queries are not supported for stateless session"); }
diff --git a/src/NHibernate/Linq/DefaultQueryProvider.cs b/src/NHibernate/Linq/DefaultQueryProvider.cs
@@ -16,22 +16,22 @@ namespace NHibernate.Linq
 	public partial interface INhQueryProvider : IQueryProvider
 	{
 		//Since 5.2
-		[Obsolete("Replaced by INhQueryProviderSupportMultiBatch interface")]
+		[Obsolete("Replaced by ISupportFutureBatchNhQueryProvider interface")]
 		IFutureEnumerable<TResult> ExecuteFuture<TResult>(Expression expression);
 
 		//Since 5.2
-		[Obsolete("Replaced by INhQueryProviderSupportMultiBatch interface")]
+		[Obsolete("Replaced by ISupportFutureBatchNhQueryProvider interface")]
 		IFutureValue<TResult> ExecuteFutureValue<TResult>(Expression expression);
 		void SetResultTransformerAndAdditionalCriteria(IQuery query, NhLinqExpression nhExpression, IDictionary<string, Tuple<object, IType>> parameters);
 		int ExecuteDml<T>(QueryMode queryMode, Expression expression);
 		Task<TResult> ExecuteAsync<TResult>(Expression expression, CancellationToken cancellationToken);
 	}
 
 	// 6.0 TODO: merge into INhQueryProvider.
-	public interface INhQueryProviderSupportMultiBatch
+	public interface ISupportFutureBatchNhQueryProvider
 	{
 		IQuery GetPreparedQuery(Expression expression, out NhLinqExpression nhExpression);
-		IMultiAnyQueryBatch GetFutureMultiBatch();
+		IQueryBatch GetFutureBatch();
 	}
 
 	/// <summary>
@@ -47,7 +47,7 @@ public interface IQueryProviderWithOptions : IQueryProvider
 		IQueryProvider WithOptions(Action<NhQueryableOptions> setOptions);
 	}
 
-	public partial class DefaultQueryProvider : INhQueryProvider, IQueryProviderWithOptions, INhQueryProviderSupportMultiBatch
+	public partial class DefaultQueryProvider : INhQueryProvider, IQueryProviderWithOptions, ISupportFutureBatchNhQueryProvider
 	{
 		private static readonly MethodInfo CreateQueryMethodDefinition = ReflectHelper.GetMethodDefinition((INhQueryProvider p) => p.CreateQuery<object>(null));
 
@@ -123,7 +123,7 @@ public virtual IQueryable<T> CreateQuery<T>(Expression expression)
 		}
 
 		//Since 5.2
-		[Obsolete("Replaced by INhQueryProviderSupportMultiBatch interface")]
+		[Obsolete("Replaced by ISupportFutureBatchNhQueryProvider interface")]
 		public virtual IFutureEnumerable<TResult> ExecuteFuture<TResult>(Expression expression)
 		{
 			var nhExpression = PrepareQuery(expression, out var query);
@@ -136,12 +136,12 @@ public virtual IFutureEnumerable<TResult> ExecuteFuture<TResult>(Expression expr
 		}
 
 		//Since 5.2
-		[Obsolete("Replaced by INhQueryProviderSupportMultiBatch interface")]
+		[Obsolete("Replaced by ISupportFutureBatchNhQueryProvider interface")]
 		public virtual IFutureValue<TResult> ExecuteFutureValue<TResult>(Expression expression)
 		{
 			var nhExpression = PrepareQuery(expression, out var query);
-			var linqBatchItem = new MultiAnyLinqQuery<TResult>(query, nhExpression);
-			return Session.GetFutureMultiBatch().AddAsValue(linqBatchItem);
+			var linqBatchItem = new LinqBatchItem<TResult>(query, nhExpression);
+			return Session.GetFutureBatch().AddAsValue(linqBatchItem);
 		}
 
 		//Since 5.2
@@ -296,9 +296,9 @@ public IQuery GetPreparedQuery(Expression expression, out NhLinqExpression nhExp
 			return query;
 		}
 
-		public IMultiAnyQueryBatch GetFutureMultiBatch()
+		public IQueryBatch GetFutureBatch()
 		{
-			return Session.GetFutureMultiBatch();
+			return Session.GetFutureBatch();
 		}
 	}
 }
diff --git a/src/NHibernate/Linq/LinqExtensionMethods.cs b/src/NHibernate/Linq/LinqExtensionMethods.cs
@@ -2404,9 +2404,9 @@ async Task<List<TSource>> InternalToListAsync()
 		/// <exception cref="T:System.NotSupportedException"><paramref name="source" /> <see cref="IQueryable.Provider"/> is not a <see cref="INhQueryProvider"/>.</exception>
 		public static IFutureEnumerable<TSource> ToFuture<TSource>(this IQueryable<TSource> source)
 		{
-			if (source.Provider is INhQueryProviderSupportMultiBatch batchProvider)
+			if (source.Provider is ISupportFutureBatchNhQueryProvider batchProvider)
 			{
-				return batchProvider.GetFutureMultiBatch().AddAsEnumerable(source);
+				return batchProvider.GetFutureBatch().AddAsEnumerable(source);
 			}
 #pragma warning disable CS0618 // Type or member is obsolete
 			var provider = GetNhProvider(source);
@@ -2425,9 +2425,9 @@ public static IFutureEnumerable<TSource> ToFuture<TSource>(this IQueryable<TSour
 		/// <exception cref="T:System.NotSupportedException"><paramref name="source" /> <see cref="IQueryable.Provider"/> is not a <see cref="INhQueryProvider"/>.</exception>
 		public static IFutureValue<TSource> ToFutureValue<TSource>(this IQueryable<TSource> source)
 		{
-			if (source.Provider is INhQueryProviderSupportMultiBatch batchProvider)
+			if (source.Provider is ISupportFutureBatchNhQueryProvider batchProvider)
 			{
-				return batchProvider.GetFutureMultiBatch().AddAsValue(source);
+				return batchProvider.GetFutureBatch().AddAsValue(source);
 			}
 #pragma warning disable CS0618, CS0612// Type or member is obsolete
 			var provider = GetNhProvider(source);
@@ -2449,9 +2449,9 @@ public static IFutureValue<TSource> ToFutureValue<TSource>(this IQueryable<TSour
 		/// <exception cref="T:System.NotSupportedException"><paramref name="source" /> <see cref="IQueryable.Provider"/> is not a <see cref="INhQueryProvider"/>.</exception>
 		public static IFutureValue<TResult> ToFutureValue<TSource, TResult>(this IQueryable<TSource> source, Expression<Func<IQueryable<TSource>, TResult>> selector)
 		{
-			if (source.Provider is INhQueryProviderSupportMultiBatch batchProvider)
+			if (source.Provider is ISupportFutureBatchNhQueryProvider batchProvider)
 			{
-				return batchProvider.GetFutureMultiBatch().AddAsValue(source, selector);
+				return batchProvider.GetFutureBatch().AddAsValue(source, selector);
 			}
 #pragma warning disable CS0618 // Type or member is obsolete
 			var expression = ReplacingExpressionVisitor
diff --git a/src/NHibernate/Multi/CriteriaBatchItem.cs b/src/NHibernate/Multi/CriteriaBatchItem.cs
@@ -5,11 +5,11 @@
 
 namespace NHibernate
 {
-	public partial class MultiAnyCriteriaQuery<T> : MultiAnyQueryBase<T>
+	public partial class CriteriaBatchItem<T> : QueryBatchItemBase<T>
 	{
 		private readonly CriteriaImpl _criteria;
 
-		public MultiAnyCriteriaQuery(ICriteria criteria)
+		public CriteriaBatchItem(ICriteria criteria)
 		{
 			_criteria = (CriteriaImpl) criteria;
 		}
diff --git a/src/NHibernate/Multi/FutureExtensions.cs b/src/NHibernate/Multi/FutureExtensions.cs
diff --git a/src/NHibernate/Multi/IQueryBatch.cs b/src/NHibernate/Multi/IQueryBatch.cs
diff --git a/src/NHibernate/Multi/IQueryBatchItem.cs b/src/NHibernate/Multi/IQueryBatchItem.cs
diff --git a/src/NHibernate/Multi/LinqBatchItem.cs b/src/NHibernate/Multi/LinqBatchItem.cs
diff --git a/src/NHibernate/Multi/QueryBatch.cs b/src/NHibernate/Multi/QueryBatch.cs
diff --git a/src/NHibernate/Multi/QueryBatchItem.cs b/src/NHibernate/Multi/QueryBatchItem.cs
diff --git a/src/NHibernate/Multi/QueryBatchItemBase.cs b/src/NHibernate/Multi/QueryBatchItemBase.cs

Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,9 @@ public async Task CanFetchCollectionInBatchAsync()`
`94`	`94`	`var q1 = session.QueryOver<EntityComplex>()`
`95`	`95`	`.Where(x => x.Version >= 0);`
`96`	`96`
`97`		`- batch.Add(new MultiAnyCriteriaQuery<object>(q1.RootCriteria));`
	`97`	`+ batch.Add(new CriteriaBatchItem<object>(q1.RootCriteria));`
`98`	`98`
`99`		`- batch.Add(new MultiAnyLinqQuery<EntityComplex>(session.Query<EntityComplex>().Fetch(c => c.ChildrenList)));`
	`99`	`+ batch.Add(new LinqBatchItem<EntityComplex>(session.Query<EntityComplex>().Fetch(c => c.ChildrenList)));`
`100`	`100`	`await (batch.ExecuteAsync());`
`101`	`101`	`var parent = await (session.LoadAsync<EntityComplex>(_parentId));`
`102`	`102`	`Assert.That(NHibernateUtil.IsInitialized(parent), Is.True);`
`@@ -341,10 +341,10 @@ protected override void OnSetUp()`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
`344`		`- private static MultiAnyQueryBatch NewBatch(ISession session)`
	`344`	`+ private static QueryBatch NewBatch(ISession session)`
`345`	`345`	`{`
`346`	`346`	`var si = session.GetSessionImplementation();`
`347`		`- var batch = new MultiAnyQueryBatch(si);`
	`347`	`+ var batch = new QueryBatch(si);`
`348`	`348`	`return batch;`
`349`	`349`	`}`
`350`	`350`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,9 @@ public void CanFetchCollectionInBatch()`
`83`	`83`	`var q1 = session.QueryOver<EntityComplex>()`
`84`	`84`	`.Where(x => x.Version >= 0);`
`85`	`85`
`86`		`- batch.Add(new MultiAnyCriteriaQuery<object>(q1.RootCriteria));`
	`86`	`+ batch.Add(new CriteriaBatchItem<object>(q1.RootCriteria));`
`87`	`87`
`88`		`- batch.Add(new MultiAnyLinqQuery<EntityComplex>(session.Query<EntityComplex>().Fetch(c => c.ChildrenList)));`
	`88`	`+ batch.Add(new LinqBatchItem<EntityComplex>(session.Query<EntityComplex>().Fetch(c => c.ChildrenList)));`
`89`	`89`	`batch.Execute();`
`90`	`90`	`var parent = session.Load<EntityComplex>(_parentId);`
`91`	`91`	`Assert.That(NHibernateUtil.IsInitialized(parent), Is.True);`
`@@ -330,10 +330,10 @@ protected override void OnSetUp()`
`330`	`330`	`}`
`331`	`331`	`}`
`332`	`332`
`333`		`- private static MultiAnyQueryBatch NewBatch(ISession session)`
	`333`	`+ private static QueryBatch NewBatch(ISession session)`
`334`	`334`	`{`
`335`	`335`	`var si = session.GetSessionImplementation();`
`336`		`- var batch = new MultiAnyQueryBatch(si);`
	`336`	`+ var batch = new QueryBatch(si);`
`337`	`337`	`return batch;`
`338`	`338`	`}`
`339`	`339`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public partial interface INhQueryProvider : IQueryProvider`
`28`	`28`	`Task<int> ExecuteDmlAsync<T>(QueryMode queryMode, Expression expression, CancellationToken cancellationToken);`
`29`	`29`	`}`
`30`	`30`
`31`		`- public partial class DefaultQueryProvider : INhQueryProvider, IQueryProviderWithOptions, INhQueryProviderSupportMultiBatch`
	`31`	`+ public partial class DefaultQueryProvider : INhQueryProvider, IQueryProviderWithOptions, ISupportFutureBatchNhQueryProvider`
`32`	`32`	`{`
`33`	`33`
`34`	`34`	`// Since v5.1`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace NHibernate`
`17`	`17`	`{`
`18`	`18`	`using System.Threading.Tasks;`
`19`	`19`	`using System.Threading;`
`20`		`- public partial class MultiAnyCriteriaQuery<T> : MultiAnyQueryBase<T>`
	`20`	`+ public partial class CriteriaBatchItem<T> : QueryBatchItemBase<T>`
`21`	`21`	`{`
`22`	`22`
`23`	`23`	`protected override Task<IList<T>> ExecuteQueryNowAsync(CancellationToken cancellationToken = default(CancellationToken))`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace NHibernate`
`12`	`12`	`{`
`13`	`13`	`using System.Threading.Tasks;`
`14`	`14`	`using System.Threading;`
`15`		`- public partial interface IMultiAnyQueryBatch`
	`15`	`+ public partial interface IQueryBatch`
`16`	`16`	`{`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// Executes batch`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace NHibernate`
`19`	`19`	`using System.Threading.Tasks;`
`20`	`20`	`using System.Threading;`
`21`	`21`
`22`		`- public partial interface IMultiAnyQuery`
	`22`	`+ public partial interface IQueryBatchItem`
`23`	`23`	`{`
`24`	`24`
`25`	`25`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace NHibernate`
`21`	`21`	`{`
`22`	`22`	`using System.Threading.Tasks;`
`23`	`23`	`using System.Threading;`
`24`		`- public partial class MultiAnyLinqQuery<T> : MultiAnyQuery<T>`
	`24`	`+ public partial class LinqBatchItem<T> : QueryBatchItem<T>`
`25`	`25`	`{`
`26`	`26`
`27`	`27`	`protected override async Task<IList<T>> ExecuteQueryNowAsync(CancellationToken cancellationToken = default(CancellationToken))`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace NHibernate`
`23`	`23`	`{`
`24`	`24`	`using System.Threading.Tasks;`
`25`	`25`	`using System.Threading;`
`26`		`- public abstract partial class MultiAnyQueryBase<TResult> : IMultiAnyQuery<TResult>`
	`26`	`+ public abstract partial class QueryBatchItemBase<TResult> : IQueryBatchItem<TResult>`
`27`	`27`	`{`
`28`	`28`
`29`	`29`	`public async Task PostProcessAsync(CancellationToken cancellationToken = default(CancellationToken))`