Merge pull request #4 from rdavanzo/master

Providing more access to FilterDefs from IFullTextSession

Author: TimurZanagar

src/NHibernate.Search/Engine/ISearchFactoryImplementor.cs

@@ -25,12 +25,20 @@ public interface ISearchFactoryImplementor : ISearchFactory
 
         IFilterCachingStrategy GetFilterCachingStrategy();
 
-        FilterDef GetFilterDefinition(string name);
-
         LuceneIndexingParameters GetIndexingParameters(IDirectoryProvider provider);
 
         void AddIndexingParameters(IDirectoryProvider provider, LuceneIndexingParameters indexingParameters);
 
         void Close();
+
+        /// <summary>
+        /// Adds a FilterDef object to the ISearchFactory implementation with the given name.
+        /// In most cases, FilterDefs should be added during mapping configuration in a 
+        /// custom ISearchMapping implementation. This method enables FilterDefs to be added 
+        /// after mapping at run-time anytime an IFullTextSession is available. 
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="filter"></param>
+        void AddFilterDefinition(string name, FilterDef filter);
     }
 }

src/NHibernate.Search/ISearchFactory.cs

@@ -1,3 +1,4 @@
+using NHibernate.Search.Engine;
 using NHibernate.Search.Reader;
 using NHibernate.Search.Store;
 
@@ -35,5 +36,22 @@ public interface ISearchFactory
         /// </summary>
         /// <param name="entityType"></param>
         void Optimize(System.Type entityType);
+
+        /// <summary>
+        /// Gets a FilterDef object by name from the ISearchFactory implementation. 
+        /// A return value indicates if a matching FilterDef was found
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="filter"></param>
+        /// <returns>True/false whether or not a FilterDef exists for the name.</returns>
+        bool TryGetFilterDefinition(string name, out FilterDef filter);
+
+        /// <summary>
+        /// Gets a FilterDef object by name from the ISearchFactory implementation. 
+        /// Throws an exception if one does not exist.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns>A FilterDef object associated with the included name parameter.</returns>
+        FilterDef GetFilterDefinition(string name);
     }
 }

src/NHibernate.Search/Impl/SearchFactoryImpl.cs

@@ -288,11 +288,21 @@ public void RegisterDirectoryProviderForLocks(IDirectoryProvider provider)
             }
         }
 
+        public bool TryGetFilterDefinition(string name, out FilterDef filter)
+        {
+            return filterDefinitions.TryGetValue(name, out filter);
+        }
+
         public FilterDef GetFilterDefinition(string name)
         {
             return filterDefinitions[name];
         }
 
+        public void AddFilterDefinition(string name, FilterDef filter)
+        {
+            filterDefinitions.Add(name, filter);
+        }
+
         public IOptimizerStrategy GetOptimizerStrategy(IDirectoryProvider provider)
         {
             return dirProviderOptimizerStrategy[provider];