Refactoring (extract interface)

SVN: trunk@5067

Author: fabiomaulo

src/NHibernate/Linq/Functions/FunctionRegistry.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Linq.Expressions;
@@ -9,8 +8,8 @@
 
 namespace NHibernate.Linq.Functions
 {
-    public class FunctionRegistry
-    {
+	public class FunctionRegistry : ILinqToHqlGeneratorsRegistry
+	{
         public static readonly FunctionRegistry Instance = new FunctionRegistry();
 
         private readonly Dictionary<MethodInfo, IHqlGeneratorForMethod> registeredMethods = new Dictionary<MethodInfo, IHqlGeneratorForMethod>();
@@ -26,36 +25,6 @@ private FunctionRegistry()
             Register(new ICollectionGenerator());
         }
 
-        public IHqlGeneratorForMethod GetGenerator(MethodInfo method)
-        {
-            IHqlGeneratorForMethod methodGenerator;
-
-            if (!TryGetMethodGenerator(method, out methodGenerator))
-            {
-                throw new NotSupportedException(method.ToString());
-            }
-
-            return methodGenerator;
-        }
-
-        public bool TryGetMethodGenerator(MethodInfo method, out IHqlGeneratorForMethod methodGenerator)
-        {
-            if (method.IsGenericMethod)
-            {
-                method = method.GetGenericMethodDefinition();
-            }
-
-            if (GetRegisteredMethodGenerator(method, out methodGenerator)) return true;
-
-            // No method generator registered.  Look to see if it's a standard LinqExtensionMethod
-            if (GetStandardLinqExtensionMethodGenerator(method, out methodGenerator)) return true;
-
-            // Not that either.  Let's query each type generator to see if it can handle it
-            if (GetMethodGeneratorForType(method, out methodGenerator)) return true;
-
-            return false;
-        }
-
         private bool GetMethodGeneratorForType(MethodInfo method, out IHqlGeneratorForMethod methodGenerator)
         {
             methodGenerator = null;
@@ -105,7 +74,30 @@ public IHqlGeneratorForProperty GetGenerator(MemberInfo member)
             return null;
         }
 
-        public void RegisterGenerator(MethodInfo method, IHqlGeneratorForMethod generator)
+		public bool TryGetGenerator(MethodInfo method, out IHqlGeneratorForMethod generator)
+		{
+			if (method.IsGenericMethod)
+			{
+				method = method.GetGenericMethodDefinition();
+			}
+
+			if (GetRegisteredMethodGenerator(method, out generator)) return true;
+
+			// No method generator registered.  Look to see if it's a standard LinqExtensionMethod
+			if (GetStandardLinqExtensionMethodGenerator(method, out generator)) return true;
+
+			// Not that either.  Let's query each type generator to see if it can handle it
+			if (GetMethodGeneratorForType(method, out generator)) return true;
+
+			return false;
+		}
+
+		public bool TryGetGenerator(MemberInfo property, out IHqlGeneratorForProperty generator)
+		{
+			return registeredProperties.TryGetValue(property, out generator);
+		}
+
+		public void RegisterGenerator(MethodInfo method, IHqlGeneratorForMethod generator)
         {
             registeredMethods.Add(method, generator);
         }

src/NHibernate/Linq/Functions/ILinqToHqlGeneratorsRegistry.cs

@@ -0,0 +1,12 @@
+using System.Reflection;
+
+namespace NHibernate.Linq.Functions
+{
+	public interface ILinqToHqlGeneratorsRegistry
+	{
+		bool TryGetGenerator(MethodInfo method, out IHqlGeneratorForMethod generator);
+		bool TryGetGenerator(MemberInfo property, out IHqlGeneratorForProperty generator);
+		void RegisterGenerator(MethodInfo method, IHqlGeneratorForMethod generator);
+		void RegisterGenerator(MemberInfo property, IHqlGeneratorForProperty generator);
+	}
+}

src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs

@@ -351,9 +351,10 @@ protected HqlTreeNode VisitMemberExpression(MemberExpression expression)
             }
 
             // Look for "special" properties (DateTime.Month etc)
-            var generator = FunctionRegistry.GetGenerator(expression.Member);
+            IHqlGeneratorForProperty generator;
+        	generator = FunctionRegistry.GetGenerator(expression.Member);
 
-            if (generator != null)
+        	if (generator != null)
             {
                 return generator.BuildHql(expression.Member, expression.Expression, _hqlTreeBuilder, this);
             }
@@ -394,9 +395,15 @@ protected HqlTreeNode VisitConstantExpression(ConstantExpression expression)
 
         protected HqlTreeNode VisitMethodCallExpression(MethodCallExpression expression)
         {
-            var generator = FunctionRegistry.GetGenerator(expression.Method);
+					IHqlGeneratorForMethod generator;
 
-            return generator.BuildHql(expression.Method, expression.Object, expression.Arguments, _hqlTreeBuilder, this);
+        	var method = expression.Method;
+        	if (!FunctionRegistry.TryGetGenerator(method, out generator))
+					{
+						throw new NotSupportedException(method.ToString());
+					}
+
+            return generator.BuildHql(method, expression.Object, expression.Arguments, _hqlTreeBuilder, this);
         }
 
         protected HqlTreeNode VisitLambdaExpression(LambdaExpression expression)

src/NHibernate/Linq/Visitors/SelectClauseVisitor.cs

@@ -82,7 +82,7 @@ private static bool CanBeEvaluatedInHqlSelectStatement(Expression expression)
             {
                 // Depends if it's in the function registry
                 IHqlGeneratorForMethod methodGenerator;
-                if (!FunctionRegistry.TryGetMethodGenerator(((MethodCallExpression) expression).Method, out methodGenerator))
+                if (!FunctionRegistry.TryGetGenerator(((MethodCallExpression) expression).Method, out methodGenerator))
                 {
                     return false;
                 }

src/NHibernate/NHibernate.csproj

@@ -654,6 +654,7 @@
     <Compile Include="Impl\SessionIdLoggingContext.cs" />
     <Compile Include="Linq\Expressions\AggregateExpressionNode.cs" />
     <Compile Include="Linq\EagerFetchingExtensionMethods.cs" />
+    <Compile Include="Linq\Functions\ILinqToHqlGeneratorsRegistry.cs" />
     <Compile Include="Linq\LinqExtensionMethodAttribute.cs" />
     <Compile Include="Linq\TypeHelperExtensionMethods.cs" />
     <Compile Include="Linq\Visitors\NameUnNamedParameters.cs" />