Added DefaultTranslators support

Author: Turnerj

src/MongoFramework/Infrastructure/Querying/DefaultTranslators.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using MongoFramework.Infrastructure.Querying.Translators;
+
+namespace MongoFramework.Infrastructure.Querying
+{
+	public static class DefaultTranslators
+	{
+		public static void AddTranslators()
+		{
+			ExpressionTranslation.AddTranslator(new WhereTranslator());
+			ExpressionTranslation.AddTranslator(new OrderByTranslator());
+			ExpressionTranslation.AddTranslator(new SelectTranslator());
+		}
+	}
+}

src/MongoFramework/Infrastructure/Querying/ExpressionTranslation.cs

@@ -49,47 +49,67 @@ public static class ExpressionTranslation
 
 		static ExpressionTranslation()
 		{
-			AddTranslator(new WhereTranslator(), WhereTranslator.GetSupportedMethods());
-			AddTranslator(new OrderByTranslator(), OrderByTranslator.GetSupportedMethods());
-			AddTranslator(new SelectTranslator(), SelectTranslator.GetSupportedMethods());
+			DefaultTranslators.AddTranslators();
 		}
 
-		public static void AddTranslator(IMethodTranslator translator, IEnumerable<MethodInfo> methods)
+		public static void AddTranslator(IQueryTranslator translator)
 		{
-			lock (MethodTranslatorMap)
+			if (translator is IMethodTranslator methodTranslator)
 			{
-				foreach (var method in methods)
+				lock (MethodTranslatorMap)
 				{
-					MethodTranslatorMap.Add(method, translator);
+					foreach (var method in methodTranslator.GetSupportedMethods())
+					{
+						MethodTranslatorMap.Add(method, methodTranslator);
+					}
 				}
 			}
-		}
-
-		public static void AddTranslator(IMemberTranslator translator, IEnumerable<MemberInfo> members)
-		{
-			lock (MemberTranslatorMap)
+			else if (translator is IMemberTranslator memberTranslator)
 			{
-				foreach (var member in members)
+				lock (MemberTranslatorMap)
 				{
-					MemberTranslatorMap.Add(member, translator);
+					foreach (var member in memberTranslator.GetSupportedMembers())
+					{
+						MemberTranslatorMap.Add(member, memberTranslator);
+					}
 				}
 			}
+			else if (translator is IBinaryExpressionTranslator binaryExpressionTranslator)
+			{
+				lock (BinaryTranslatorMap)
+				{
+					foreach (var expressionType in binaryExpressionTranslator.GetSupportedExpressionTypes())
+					{
+						if (DefaultSupportedTypes.Contains(expressionType))
+						{
+							throw new ArgumentException($"{expressionType} is a default expression type and can not have a custom translator");
+						}
+
+						BinaryTranslatorMap.Add(expressionType, binaryExpressionTranslator);
+					}
+				}
+			}
+			else
+			{
+				throw new ArgumentException($"Invalid type of translator. It must implement {nameof(IMethodTranslator)}, {nameof(IMemberTranslator)} or {nameof(IBinaryExpressionTranslator)}.", nameof(translator));
+			}
 		}
 
-		public static void AddTranslator(IBinaryExpressionTranslator translator, IEnumerable<ExpressionType> expressionTypes)
+		public static void ClearTranslators()
 		{
+			lock (MethodTranslatorMap)
+			{
+				MethodTranslatorMap.Clear();
+			}
 
-			lock (BinaryTranslatorMap)
+			lock (MemberTranslatorMap)
 			{
-				foreach (var expressionType in expressionTypes)
-				{
-					if (DefaultSupportedTypes.Contains(expressionType))
-					{
-						throw new ArgumentException($"{expressionType} is a default expression type and can not have a custom translator");
-					}
+				MemberTranslatorMap.Clear();
+			}
 
-					BinaryTranslatorMap.Add(expressionType, translator);
-				}
+			lock (BinaryTranslatorMap)
+			{
+				BinaryTranslatorMap.Clear();
 			}
 		}
 

src/MongoFramework/Infrastructure/Querying/TranslatorInterfaces.cs

@@ -1,23 +1,28 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
+using System.Reflection;
 using System.Text;
 using MongoDB.Bson;
 
 namespace MongoFramework.Infrastructure.Querying
 {
-	public interface IMethodTranslator
+	public interface IQueryTranslator { }
+	public interface IMethodTranslator : IQueryTranslator
 	{
+		IEnumerable<MethodInfo> GetSupportedMethods();
 		BsonValue TranslateMethod(MethodCallExpression expression, IEnumerable<Expression> suffixExpressions = default);
 	}
 
-	public interface IMemberTranslator
+	public interface IMemberTranslator : IQueryTranslator
 	{
+		IEnumerable<MemberInfo> GetSupportedMembers();
 		BsonValue TranslateMember(MemberExpression expression, IEnumerable<Expression> suffixExpressions = default);
 	}
 
-	public interface IBinaryExpressionTranslator
+	public interface IBinaryExpressionTranslator : IQueryTranslator
 	{
+		IEnumerable<ExpressionType> GetSupportedExpressionTypes();
 		BsonValue TranslateBinary(BinaryExpression expression);
 	}
 }

src/MongoFramework/Infrastructure/Querying/Translators/OrderByTranslator.cs

@@ -10,7 +10,7 @@ namespace MongoFramework.Infrastructure.Querying.Translators
 {
 	public class OrderByTranslator : IMethodTranslator
 	{
-		public static IEnumerable<MethodInfo> GetSupportedMethods()
+		public IEnumerable<MethodInfo> GetSupportedMethods()
 		{
 			yield return TranslationHelper.GetMethodDefinition(() => Queryable.OrderBy(null, (Expression<Func<object, bool>>)null));
 			yield return TranslationHelper.GetMethodDefinition(() => Queryable.OrderByDescending(null, (Expression<Func<object, bool>>)null));

src/MongoFramework/Infrastructure/Querying/Translators/SelectTranslator.cs

@@ -10,7 +10,7 @@ namespace MongoFramework.Infrastructure.Querying.Translators
 {
 	public class SelectTranslator : IMethodTranslator
 	{
-		public static IEnumerable<MethodInfo> GetSupportedMethods()
+		public IEnumerable<MethodInfo> GetSupportedMethods()
 		{
 			yield return TranslationHelper.GetMethodDefinition(() => Queryable.Select(null, (Expression<Func<object, object>>)null));
 		}

src/MongoFramework/Infrastructure/Querying/Translators/WhereTranslator.cs

@@ -10,7 +10,7 @@ namespace MongoFramework.Infrastructure.Querying.Translators
 {
 	public class WhereTranslator : IMethodTranslator
 	{
-		public static IEnumerable<MethodInfo> GetSupportedMethods()
+		public IEnumerable<MethodInfo> GetSupportedMethods()
 		{
 			yield return TranslationHelper.GetMethodDefinition(() => Queryable.Where(null, (Expression<Func<object, bool>>)null));
 		}