Refactoring (removed some 'static' and pushed out the responsibility of creation of ILinqToHqlGeneratorsRegistry)

SVN: trunk@5070

Author: fabiomaulo

src/NHibernate/Cfg/Settings.cs

@@ -6,6 +6,7 @@
 using NHibernate.Connection;
 using NHibernate.Exceptions;
 using NHibernate.Hql;
+using NHibernate.Linq.Functions;
 using NHibernate.Transaction;
 
 namespace NHibernate.Cfg
@@ -119,6 +120,11 @@ public Settings()
 
 		public bool IsOuterJoinFetchEnabled { get; internal set; }
 
+		/// <summary>
+		/// Get the registry to provide Hql-Generators for known properties/methods.
+		/// </summary>
+		public ILinqToHqlGeneratorsRegistry LinqToHqlGeneratorsRegistry { get; internal set; }
+
 		#endregion
 	}
 }

src/NHibernate/Cfg/SettingsFactory.cs

@@ -10,6 +10,7 @@
 using NHibernate.Dialect;
 using NHibernate.Exceptions;
 using NHibernate.Hql;
+using NHibernate.Linq.Functions;
 using NHibernate.Transaction;
 using NHibernate.Util;
 
@@ -51,6 +52,8 @@ public Settings BuildSettings(IDictionary<string, string> properties)
 			}
 			settings.Dialect = dialect;
 
+			settings.LinqToHqlGeneratorsRegistry = new FunctionRegistry();
+
 			#region SQL Exception converter
 
 			ISQLExceptionConverter sqlExceptionConverter;

src/NHibernate/IQueryExpression.cs

@@ -1,13 +1,13 @@
 using System.Collections.Generic;
+using NHibernate.Engine;
 using NHibernate.Engine.Query;
 using NHibernate.Hql.Ast.ANTLR.Tree;
-using NHibernate.Impl;
 
 namespace NHibernate
 {
     public interface IQueryExpression
     {
-        IASTNode Translate(ISessionFactory sessionFactory);
+        IASTNode Translate(ISessionFactoryImplementor sessionFactory);
         string Key { get; }
         System.Type Type { get; }
     	IList<NamedParameterDescriptor> ParameterDescriptors { get; }

src/NHibernate/Impl/ExpressionQueryImpl.cs

@@ -150,7 +150,7 @@ public ExpandedQueryExpression(IQueryExpression queryExpression, IASTNode tree,
             ParameterDescriptors = queryExpression.ParameterDescriptors;
         }
 
-        public IASTNode Translate(ISessionFactory sessionFactory)
+        public IASTNode Translate(ISessionFactoryImplementor sessionFactory)
         {
             return _tree;
         }

src/NHibernate/Linq/Functions/FunctionRegistry.cs

@@ -10,13 +10,11 @@ namespace NHibernate.Linq.Functions
 {
 	public class FunctionRegistry : ILinqToHqlGeneratorsRegistry
 	{
-		public static readonly ILinqToHqlGeneratorsRegistry Instance = new FunctionRegistry();
-
 		private readonly Dictionary<MethodInfo, IHqlGeneratorForMethod> registeredMethods = new Dictionary<MethodInfo, IHqlGeneratorForMethod>();
 		private readonly Dictionary<MemberInfo, IHqlGeneratorForProperty> registeredProperties = new Dictionary<MemberInfo, IHqlGeneratorForProperty>();
 		private readonly List<IHqlGeneratorForType> typeGenerators = new List<IHqlGeneratorForType>();
 
-		private FunctionRegistry()
+		public FunctionRegistry()
 		{
 			// TODO - could use reflection here
 			Register(new QueryableGenerator());

src/NHibernate/Linq/NhLinqExpression.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using NHibernate.Engine;
 using NHibernate.Engine.Query;
 using NHibernate.Hql.Ast.ANTLR.Tree;
 using NHibernate.Linq.Visitors;
@@ -54,7 +55,7 @@ public NhLinqExpression(Expression expression)
 			}
 		}
 
-	    public IASTNode Translate(ISessionFactory sessionFactory)
+	    public IASTNode Translate(ISessionFactoryImplementor sessionFactory)
 		{
             //if (_astNode == null)
             {

src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs

@@ -23,7 +23,7 @@ public static HqlTreeNode Visit(Expression expression, VisitorParameters paramet
 
         public HqlGeneratorExpressionTreeVisitor(VisitorParameters parameters)
         {
-        	functionRegistry = FunctionRegistry.Instance;
+					functionRegistry = parameters.SessionFactory.Settings.LinqToHqlGeneratorsRegistry;
         	_parameters = parameters;
 			_hqlTreeBuilder = new HqlTreeBuilder();
         }

src/NHibernate/Linq/Visitors/SelectClauseVisitor.cs

@@ -20,7 +20,7 @@ public class SelectClauseVisitor : ExpressionTreeVisitor
 
         public SelectClauseVisitor(System.Type inputType, VisitorParameters parameters)
         {
-        	functionRegistry = FunctionRegistry.Instance;
+        	functionRegistry = parameters.SessionFactory.Settings.LinqToHqlGeneratorsRegistry;
         	_inputParameter = Expression.Parameter(inputType, "input");
             _parameters = parameters;
         }

src/NHibernate/Linq/Visitors/VisitorParameters.cs

@@ -1,16 +1,17 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
+using NHibernate.Engine;
 using NHibernate.Engine.Query;
 
 namespace NHibernate.Linq.Visitors
 {
     public class VisitorParameters
     {
-        public ISessionFactory SessionFactory { get; private set; }
+        public ISessionFactoryImplementor SessionFactory { get; private set; }
         public IDictionary<ConstantExpression, NamedParameter> ConstantToParameterMap { get; private set; }
         public List<NamedParameterDescriptor> RequiredHqlParameters { get; private set; }
 
-        public VisitorParameters(ISessionFactory sessionFactory, IDictionary<ConstantExpression, NamedParameter> constantToParameterMap, List<NamedParameterDescriptor> requiredHqlParameters)
+				public VisitorParameters(ISessionFactoryImplementor sessionFactory, IDictionary<ConstantExpression, NamedParameter> constantToParameterMap, List<NamedParameterDescriptor> requiredHqlParameters)
         {
             SessionFactory = sessionFactory;
             ConstantToParameterMap = constantToParameterMap;