Features/implement async on full text query impl

.gitignore

@@ -39,4 +39,5 @@ hibernate.cfg.xml
 available-test-configurations
 current-test-configuration
 NHibernate.VisualState.xml
-src/.vs
+src/.vs
+/.vs/slnx.sqlite

src/NHibernate.Search.Tests/Analyzer/AbstractTestAnalyzer.cs

@@ -1,20 +1,30 @@
+using System;
 using System.IO;
 using Lucene.Net.Analysis;
+using Lucene.Net.Analysis.Standard;
+using Lucene.Net.Util;
 
 namespace NHibernate.Search.Tests.Analyzer
 {
     public abstract class AbstractTestAnalyzer : Lucene.Net.Analysis.Analyzer
     {
-        protected abstract string[] Tokens { get; }
+        private readonly LuceneVersion _version;
 
-        public override TokenStream TokenStream(string fieldName, TextReader reader)
+        protected AbstractTestAnalyzer(LuceneVersion version)
         {
-            return new InternalTokenStream(Tokens);
+            _version = version;
         }
 
+        protected abstract string[] Tokens { get; }
+
+        /// <inheritdoc />
+        protected override TokenStreamComponents CreateComponents(String fieldName, TextReader reader) =>
+            new TokenStreamComponents(
+                new StandardTokenizer(_version, reader), new InternalTokenStream(Tokens));
+
         #region Nested type: InternalTokenStream
 
-        private class InternalTokenStream : TokenStream
+        private sealed class InternalTokenStream : TokenStream
         {
             private readonly string[] tokens;
             private int position;
@@ -24,9 +34,16 @@ public InternalTokenStream(string[] tokens)
                 this.tokens = tokens;
             }
 
-            public override Token Next()
+            /// <inheritdoc />
+            public override Boolean IncrementToken()
             {
-                return position >= tokens.Length ? null : new Token(tokens[position++], 0, 0);
+                if (position < tokens.Length)
+                {
+                    position++;
+                    return true;
+                }
+
+                return false;
             }
         }
 

src/NHibernate.Search.Tests/Analyzer/AnalyzerTest.cs

@@ -1,6 +1,8 @@
 using System.Collections;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.QueryParsers;
+using Lucene.Net.QueryParsers.Classic;
+using Lucene.Net.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Search.Tests.Analyzer
@@ -31,7 +33,7 @@ public void TestScopedAnalyzers()
 
             tx = s.BeginTransaction();
 
-            QueryParser parser = new QueryParser("id", new StandardAnalyzer());
+            QueryParser parser = new QueryParser(LuceneVersion.LUCENE_48, "id", new StandardAnalyzer(LuceneVersion.LUCENE_48));
             Lucene.Net.Search.Query luceneQuery = parser.Parse("entity:alarm");
             IFullTextQuery query = s.CreateFullTextQuery(luceneQuery, typeof(MyEntity));
             Assert.AreEqual(1, query.ResultSize, "Entity query");

src/NHibernate.Search.Tests/Analyzer/Test1Analyzer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Lucene.Net.Util;
 
 namespace NHibernate.Search.Tests.Analyzer
 {
@@ -12,5 +13,10 @@ protected override string[] Tokens
         {
             get { return tokens; }
         }
+
+        /// <inheritdoc />
+        public Test1Analyzer(LuceneVersion version) : base(version)
+        {
+        }
     }
 }

src/NHibernate.Search.Tests/Analyzer/Test2Analyzer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Lucene.Net.Util;
 
 namespace NHibernate.Search.Tests.Analyzer
 {
@@ -12,5 +13,10 @@ protected override string[] Tokens
         {
             get { return tokens; }
         }
+
+        /// <inheritdoc />
+        public Test2Analyzer(LuceneVersion version) : base(version)
+        {
+        }
     }
 }

src/NHibernate.Search.Tests/Analyzer/Test3Analyzer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Lucene.Net.Util;
 
 namespace NHibernate.Search.Tests.Analyzer
 {
@@ -12,5 +13,10 @@ protected override string[] Tokens
         {
             get { return tokens; }
         }
+
+        /// <inheritdoc />
+        public Test3Analyzer(LuceneVersion version) : base(version)
+        {
+        }
     }
 }

src/NHibernate.Search.Tests/Analyzer/Test4Analyzer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Lucene.Net.Util;
 
 namespace NHibernate.Search.Tests.Analyzer
 {
@@ -12,5 +13,10 @@ protected override string[] Tokens
         {
             get { return tokens; }
         }
+
+        /// <inheritdoc />
+        public Test4Analyzer(LuceneVersion version) : base(version)
+        {
+        }
     }
 }

src/NHibernate.Search.Tests/App.config

@@ -1,90 +1,93 @@
 <?xml version="1.0"?>
 <configuration>
-	<configSections>
-		<section name="hibernate-configuration" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate"/>
-		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
-	</configSections>
+    <configSections>
+        <section name="hibernate-configuration" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate"/>
+        <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
+    </configSections>
 
-	<connectionStrings>
-		<add name="TestConnectionString" connectionString="TestConnectionString-TestConnectionString"/>
-	</connectionStrings>
+    <connectionStrings>
+        <add name="TestConnectionString" connectionString="TestConnectionString-TestConnectionString"/>
+    </connectionStrings>
 
-	<!-- 
-		hibernate-configuration section
+    <!-- 
+        hibernate-configuration section
 
-		You don't need to change this section for your own use.
-		You can write your own hibernate.cfg.xml to override all session-factory configuration.
-		Templates are available in NHibernate.Config.Templates folder.
-	-->
-	<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
-		<bytecode-provider type="lcg"/>
-		<reflection-optimizer use="true"/>
-		<session-factory name="NHibernate.Test">
-			<property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Search.Tests</property>
-			<property name="connection.isolation">ReadCommitted</property>
+        You don't need to change this section for your own use.
+        You can write your own hibernate.cfg.xml to override all session-factory configuration.
+        Templates are available in NHibernate.Config.Templates folder.
+    -->
+    <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
+        <bytecode-provider type="lcg"/>
+        <reflection-optimizer use="true"/>
+        <session-factory name="NHibernate.Test">
+            <property name="connection.provider">NHibernate.Test.DebugConnectionProvider, NHibernate.Search.Tests</property>
+            <property name="connection.isolation">ReadCommitted</property>
 
-			<!-- This is the System.Data.dll provider for MSSQL Server -->
-			<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
-			<property name="connection.connection_string">Server=.\sqlexpress;initial catalog=nhsearch;Integrated Security=SSPI</property>
-			<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
-			<property name="adonet.batch_size">10</property>
-			<property name="prepare_sql">false</property>
-			<property name="cache.provider_class">NHibernate.Cache.HashtableCacheProvider, NHibernate</property>
-			<property name="cache.use_query_cache">true</property>
-
-			<!-- the following part is not read by the test, they are here being a template-->
-			<listener class="NHibernate.Search.Event.FullTextIndexEventListener, NHibernate.Search" type="post-insert"/>
-			<listener class="NHibernate.Search.Event.FullTextIndexEventListener, NHibernate.Search" type="post-update"/>
-			<listener class="NHibernate.Search.Event.FullTextIndexEventListener, NHibernate.Search" type="post-delete"/>
-			<listener class="NHibernate.Search.Event.FullTextIndexCollectionEventListener, NHibernate.Search" type="post-collection-recreate"/>
-			<listener class="NHibernate.Search.Event.FullTextIndexCollectionEventListener, NHibernate.Search" type="post-collection-remove"/>
-			<listener class="NHibernate.Search.Event.FullTextIndexCollectionEventListener, NHibernate.Search" type="post-collection-update"/>
-		</session-factory>
-	</hibernate-configuration>
+            <!-- This is the System.Data.dll provider for MSSQL Server -->
+            <property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
+            <property name="connection.connection_string">Server=.\sqlexpress;initial catalog=nhsearch;Integrated Security=SSPI</property>
+            <property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
+            <property name="adonet.batch_size">10</property>
+            <property name="prepare_sql">false</property>
+            <property name="cache.provider_class">NHibernate.Cache.HashtableCacheProvider, NHibernate</property>
+            <property name="cache.use_query_cache">true</property>
 
-	<!-- This section contains the log4net configuration settings -->
-	<log4net debug="false">
-		<appender name="trace" type="log4net.Appender.TraceAppender, log4net">
-			<layout type="log4net.Layout.PatternLayout,log4net">
-				<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/>
-			</layout>
-		</appender>
+            <!-- the following part is not read by the test, they are here being a template-->
+            <listener class="NHibernate.Search.Event.FullTextIndexEventListener, NHibernate.Search" type="post-insert"/>
+            <listener class="NHibernate.Search.Event.FullTextIndexEventListener, NHibernate.Search" type="post-update"/>
+            <listener class="NHibernate.Search.Event.FullTextIndexEventListener, NHibernate.Search" type="post-delete"/>
+            <listener class="NHibernate.Search.Event.FullTextIndexCollectionEventListener, NHibernate.Search" type="post-collection-recreate"/>
+            <listener class="NHibernate.Search.Event.FullTextIndexCollectionEventListener, NHibernate.Search" type="post-collection-remove"/>
+            <listener class="NHibernate.Search.Event.FullTextIndexCollectionEventListener, NHibernate.Search" type="post-collection-update"/>
+        </session-factory>
+    </hibernate-configuration>
 
-		<appender name="console" type="log4net.Appender.ConsoleAppender, log4net">
-			<layout type="log4net.Layout.PatternLayout,log4net">
-				<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/>
-			</layout>
-		</appender>
+    <!-- This section contains the log4net configuration settings -->
+    <log4net debug="false">
+        <appender name="trace" type="log4net.Appender.TraceAppender, log4net">
+            <layout type="log4net.Layout.PatternLayout,log4net">
+                <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/>
+            </layout>
+        </appender>
 
-		<appender name="rollingFile" type="log4net.Appender.RollingFileAppender,log4net">
-			<param name="File" value="log.txt"/>
-			<param name="AppendToFile" value="false"/>
-			<param name="RollingStyle" value="Date"/>
-			<param name="DatePattern" value="yyyy.MM.dd"/>
-			<param name="StaticLogFileName" value="true"/>
+        <appender name="console" type="log4net.Appender.ConsoleAppender, log4net">
+            <layout type="log4net.Layout.PatternLayout,log4net">
+                <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/>
+            </layout>
+        </appender>
 
-			<layout type="log4net.Layout.PatternLayout,log4net">
-				<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
-			</layout>
-		</appender>
+        <appender name="rollingFile" type="log4net.Appender.RollingFileAppender,log4net">
+            <param name="File" value="log.txt"/>
+            <param name="AppendToFile" value="false"/>
+            <param name="RollingStyle" value="Date"/>
+            <param name="DatePattern" value="yyyy.MM.dd"/>
+            <param name="StaticLogFileName" value="true"/>
 
-		<!-- Setup the root category, add the appenders and set the default priority -->
-		<root>
-			<priority value="WARN"/>
-			<appender-ref ref="rollingFile"/>
-		</root>
+            <layout type="log4net.Layout.PatternLayout,log4net">
+                <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
+            </layout>
+        </appender>
 
-		<logger name="NHibernate.Bytecode.CodeDom">
-			<priority value="OFF"/>
-		</logger>
+        <!-- Setup the root category, add the appenders and set the default priority -->
+        <root>
+            <priority value="WARN"/>
+            <appender-ref ref="rollingFile"/>
+        </root>
 
-		<logger name="NHibernate.SQL">
-			<level value="OFF"/>
-		</logger>
+        <logger name="NHibernate.Bytecode.CodeDom">
+            <priority value="OFF"/>
+        </logger>
 
-		<logger name="NHibernate.Tool.hbm2ddl.SchemaExport">
-			<level value="WARN"/>
-		</logger>
-	</log4net>
+        <logger name="NHibernate.SQL">
+            <level value="OFF"/>
+        </logger>
 
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+        <logger name="NHibernate.Tool.hbm2ddl.SchemaExport">
+            <level value="WARN"/>
+        </logger>
+    </log4net>
+
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    </startup>
+</configuration>