ISessionImplementor.AutoFlushIfRequired

Author: bahusoid

src/NHibernate/Async/Engine/ISessionImplementor.cs

@@ -28,6 +28,19 @@ namespace NHibernate.Engine
 {
 	using System.Threading.Tasks;
 	using System.Threading;
+	internal static partial class SessionImplementorExtensions
+	{
+
+		internal static async Task AutoFlushIfRequiredAsync(this ISessionImplementor implementor, ISet<string> querySpaces, CancellationToken cancellationToken)
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+			var autoFlushIfRequiredTask = (implementor as AbstractSessionImpl)?.AutoFlushIfRequiredAsync(querySpaces, cancellationToken);
+			if (autoFlushIfRequiredTask != null)
+			{
+				await (autoFlushIfRequiredTask).ConfigureAwait(false);
+			}
+		}
+	}
 
 	public partial interface ISessionImplementor
 	{

src/NHibernate/Async/Impl/AbstractSessionImpl.cs

@@ -166,6 +166,30 @@ public virtual async Task<IList<T>> ListCustomQueryAsync<T>(ICustomQuery customQ
 		public abstract Task<object> GetEntityUsingInterceptorAsync(EntityKey key, CancellationToken cancellationToken);
 		public abstract Task<int> ExecuteNativeUpdateAsync(NativeSQLQuerySpecification specification, QueryParameters queryParameters, CancellationToken cancellationToken);
 
+		//6.0 TODO: Make abstract
+		/// <summary>
+		/// detect in-memory changes, determine if the changes are to tables
+		/// named in the query and, if so, complete execution the flush
+		/// </summary>
+		/// <param name="querySpaces"></param>
+		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
+		/// <returns>Returns true if flush was executed</returns>
+		public virtual Task<bool> AutoFlushIfRequiredAsync(ISet<string> querySpaces, CancellationToken cancellationToken)
+		{
+			if (cancellationToken.IsCancellationRequested)
+			{
+				return Task.FromCanceled<bool>(cancellationToken);
+			}
+			try
+			{
+				return Task.FromResult<bool>(AutoFlushIfRequired(querySpaces));
+			}
+			catch (Exception ex)
+			{
+				return Task.FromException<bool>(ex);
+			}
+		}
+
 		public abstract Task FlushAsync(CancellationToken cancellationToken);
 
 		#endregion

src/NHibernate/Async/Impl/SessionImpl.cs

@@ -37,18 +37,6 @@ namespace NHibernate.Impl
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	internal static partial class SessionImplExtensions
-	{
-		internal static async Task AutoFlushIfRequiredAsync(this ISessionImplementor implementor, ISet<string> querySpaces, CancellationToken cancellationToken)
-		{
-			cancellationToken.ThrowIfCancellationRequested();
-			var autoFlushIfRequiredTask = (implementor as SessionImpl)?.AutoFlushIfRequiredAsync(querySpaces, cancellationToken);
-			if (autoFlushIfRequiredTask != null)
-			{
-				await (autoFlushIfRequiredTask).ConfigureAwait(false);
-			}
-		}
-	}
 	public sealed partial class SessionImpl : AbstractSessionImpl, IEventSource, ISerializable, IDeserializationCallback
 	{
 
@@ -691,8 +679,8 @@ public override async Task<object> GetEntityUsingInterceptorAsync(EntityKey key,
 		/// </summary>
 		/// <param name="querySpaces"></param>
 		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
-		/// <returns></returns>
-		internal async Task<bool> AutoFlushIfRequiredAsync(ISet<string> querySpaces, CancellationToken cancellationToken)
+		/// <returns>Returns true if flush was executed</returns>
+		public override async Task<bool> AutoFlushIfRequiredAsync(ISet<string> querySpaces, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			using (BeginProcess())

src/NHibernate/Engine/ISessionImplementor.cs

@@ -17,7 +17,7 @@
 namespace NHibernate.Engine
 {
 	// 6.0 TODO: Convert to interface methods
-	internal static class SessionImplementorExtensions
+	internal static partial class SessionImplementorExtensions
 	{
 		internal static IDisposable BeginContext(this ISessionImplementor session)
 		{
@@ -40,6 +40,11 @@ internal static IMultiAnyQueryBatch GetFutureMultiBatch(this ISessionImplementor
 		{
 			return (session as AbstractSessionImpl)?.FutureMultiBatch;
 		}
+
+		internal static void AutoFlushIfRequired(this ISessionImplementor implementor, ISet<string> querySpaces)
+		{
+			(implementor as AbstractSessionImpl)?.AutoFlushIfRequired(querySpaces);
+		}
 	}
 
 	/// <summary>

src/NHibernate/Impl/AbstractSessionImpl.cs

@@ -301,6 +301,18 @@ public virtual FlushMode FlushMode
 			set => _flushMode = value;
 		}
 
+		//6.0 TODO: Make abstract
+		/// <summary>
+		/// detect in-memory changes, determine if the changes are to tables
+		/// named in the query and, if so, complete execution the flush
+		/// </summary>
+		/// <param name="querySpaces"></param>
+		/// <returns>Returns true if flush was executed</returns>
+		public virtual bool AutoFlushIfRequired(ISet<string> querySpaces)
+		{
+			return false;
+		}
+
 		public virtual IQuery GetNamedQuery(string queryName)
 		{
 			using (BeginProcess())

src/NHibernate/Impl/SessionImpl.cs

@@ -25,14 +25,6 @@
 
 namespace NHibernate.Impl
 {
-	internal static partial class SessionImplExtensions
-	{
-		internal static void AutoFlushIfRequired(this ISessionImplementor implementor, ISet<string> querySpaces)
-		{
-			(implementor as SessionImpl)?.AutoFlushIfRequired(querySpaces);
-		}
-	}
-
 	/// <summary>
 	/// Concrete implementation of an <see cref="ISession" />, also the central, organizing component
 	/// of NHibernate's internal implementation.
@@ -1044,8 +1036,8 @@ public override IPersistenceContext PersistenceContext
 		/// named in the query and, if so, complete execution the flush
 		/// </summary>
 		/// <param name="querySpaces"></param>
-		/// <returns></returns>
-		internal bool AutoFlushIfRequired(ISet<string> querySpaces)
+		/// <returns>Returns true if flush was executed</returns>
+		public override bool AutoFlushIfRequired(ISet<string> querySpaces)
 		{
 			using (BeginProcess())
 			{