feat!: upgrade to NHibernate 5.2

Author: hazzik

src/NHibernate.Search.Tests/Async/Query/LuceneQueryTest.cs

@@ -63,7 +63,7 @@ public async Task CriteriaAsync()
             book = (Book) result[0];
             //Assert.IsFalse(NHibernate.IsInitialized(book.Authors), "Association should not be initialized");
 
-            result = await (s.CreateFullTextQuery(query).SetCriteriaQuery(s.CreateCriteria(typeof(Book)).SetFetchMode("Authors", FetchMode.Join)).ListAsync());
+            result = await (s.CreateFullTextQuery(query).SetCriteriaQuery(s.CreateCriteria(typeof(Book)).Fetch(SelectMode.Fetch, "Authors")).ListAsync());
             Assert.NotNull(result);
             Assert.AreEqual(1, result.Count, "Query with no explicit criteria");
             book = (Book)result[0];

src/NHibernate.Search.Tests/Query/LuceneQueryTest.cs

@@ -345,7 +345,7 @@ public void Criteria()
             book = (Book) result[0];
             //Assert.IsFalse(NHibernate.IsInitialized(book.Authors), "Association should not be initialized");
 
-            result = s.CreateFullTextQuery(query).SetCriteriaQuery(s.CreateCriteria(typeof(Book)).SetFetchMode("Authors", FetchMode.Join)).List();
+            result = s.CreateFullTextQuery(query).SetCriteriaQuery(s.CreateCriteria(typeof(Book)).Fetch(SelectMode.Fetch, "Authors")).List();
             Assert.NotNull(result);
             Assert.AreEqual(1, result.Count, "Query with no explicit criteria");
             book = (Book)result[0];

src/NHibernate.Search/Async/Backend/Impl/PostTransactionWorkQueueSynchronization.cs

@@ -0,0 +1,55 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using NHibernate.Transaction;
+using NHibernate.Util;
+
+namespace NHibernate.Search.Backend.Impl
+{
+    using System.Threading.Tasks;
+    using System.Threading;
+    internal partial class PostTransactionWorkQueueSynchronization : ITransactionCompletionSynchronization
+    {
+        public Task ExecuteBeforeTransactionCompletionAsync(CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromCanceled<object>(cancellationToken);
+            }
+            try
+            {
+                ExecuteBeforeTransactionCompletion();
+                return Task.CompletedTask;
+            }
+            catch (System.Exception ex)
+            {
+                return Task.FromException<object>(ex);
+            }
+        }
+
+        public Task ExecuteAfterTransactionCompletionAsync(bool success, CancellationToken cancellationToken)
+        {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return Task.FromCanceled<object>(cancellationToken);
+            }
+            try
+            {
+                ExecuteAfterTransactionCompletion(success);
+                return Task.CompletedTask;
+            }
+            catch (System.Exception ex)
+            {
+                return Task.FromException<object>(ex);
+            }
+        }
+
+    }
+}

src/NHibernate.Search/Backend/Impl/PostTransactionWorkQueueSynchronization.cs

@@ -3,7 +3,7 @@
 
 namespace NHibernate.Search.Backend.Impl
 {
-    internal class PostTransactionWorkQueueSynchronization : ISynchronization
+    internal partial class PostTransactionWorkQueueSynchronization : ITransactionCompletionSynchronization
     {
         private bool isConsumed;
         private WorkQueue queue = new WorkQueue();
@@ -19,15 +19,12 @@ public PostTransactionWorkQueueSynchronization(IQueueingProcessor queueingProces
             this.queueingProcessor = queueingProcessor;
             this.queuePerTransaction = queuePerTransaction;
         }
-
-        #region ISynchronization Members
-
-        public void BeforeCompletion()
+        public void ExecuteBeforeTransactionCompletion()
         {
             queueingProcessor.PrepareWorks(queue);
         }
 
-        public void AfterCompletion(bool success)
+        public void ExecuteAfterTransactionCompletion(bool success)
         {
             try
             {
@@ -45,8 +42,6 @@ public void AfterCompletion(bool success)
             }
         }
 
-        #endregion
-
         public void Add(Work work)
         {
             queueingProcessor.Add(work, queue);

src/NHibernate.Search/Backend/Impl/TransactionalWorker.cs

@@ -18,12 +18,10 @@ public void PerformWork(Work work, ISessionImplementor session)
             if (session.TransactionInProgress)
             {
                 ITransaction transaction = ((ISession)session).Transaction;
-                PostTransactionWorkQueueSynchronization txSync = (PostTransactionWorkQueueSynchronization)
-                                                                 synchronizationPerTransaction[transaction];
+                PostTransactionWorkQueueSynchronization txSync = (PostTransactionWorkQueueSynchronization)synchronizationPerTransaction[transaction];
                 if (txSync == null || txSync.IsConsumed)
                 {
-                    txSync =
-                        new PostTransactionWorkQueueSynchronization(queueingProcessor, synchronizationPerTransaction);
+                    txSync = new PostTransactionWorkQueueSynchronization(queueingProcessor, synchronizationPerTransaction);
                     transaction.RegisterSynchronization(txSync);
                     lock (synchronizationPerTransaction.SyncRoot)
                         synchronizationPerTransaction[transaction] = txSync;

src/NHibernate.Search/Impl/FullTextSessionImpl.cs

@@ -505,11 +505,13 @@ public void DisableFilter(string filterName)
             session.DisableFilter(filterName);
         }
 
+        [Obsolete("Use ISession.CreateQueryBatch instead.")]
         public IMultiQuery CreateMultiQuery()
         {
             return session.CreateMultiQuery();
         }
 
+        [Obsolete("Use ISession.CreateQueryBatch instead.")]
         public IMultiCriteria CreateMultiCriteria()
         {
             return session.CreateMultiCriteria();

src/NHibernate.Search/NHibernate.Search.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
 	<PackageReference Include="Lucene.Net" Version="2.9.4.1" />
-    <PackageReference Include="NHibernate" Version="5.1.7" />
+    <PackageReference Include="NHibernate" Version="5.2.0" />
     <PackageReference Include="Iesi.Collections" Version="4.0.4" />
   </ItemGroup>
   <ItemGroup>