CSHARP-1315: Replace int with object in calls to GetMethodInfo when the type really can be anything, not just int.

rstam · rstam · commit 95a34cb2c704 · 2015-09-03T13:46:38.000-04:00
diff --git a/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/DistinctBinder.cs b/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/DistinctBinder.cs
@@ -25,8 +25,8 @@ internal sealed class DistinctBinder : IMethodCallBinder<EmbeddedPipelineBinding
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Distinct<int>(null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.Distinct<int>(null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Distinct<object>(null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.Distinct<object>(null));
         }
 
         public Expression Bind(PipelineExpression pipeline, EmbeddedPipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/ExceptBinder.cs b/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/ExceptBinder.cs
@@ -25,8 +25,8 @@ internal sealed class ExceptBinder : IMethodCallBinder<EmbeddedPipelineBindingCo
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Except<int>(null, null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.Except<int>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Except<object>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.Except<object>(null, null));
         }
 
         public Expression Bind(PipelineExpression pipeline, EmbeddedPipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/IntersectBinder.cs b/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/IntersectBinder.cs
@@ -25,8 +25,8 @@ internal sealed class IntersectBinder : IMethodCallBinder<EmbeddedPipelineBindin
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Intersect<int>(null, null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.Intersect<int>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Intersect<object>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.Intersect<object>(null, null));
         }
 
         public Expression Bind(PipelineExpression pipeline, EmbeddedPipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/SelectBinder.cs b/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/SelectBinder.cs
@@ -26,8 +26,8 @@ internal sealed class SelectBinder : IMethodCallBinder<EmbeddedPipelineBindingCo
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Select(null, (Func<int, int>)null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.Select(null, (Expression<Func<int, int>>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Select(null, (Func<object, object>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.Select(null, (Expression<Func<object, object>>)null));
         }
 
         public Expression Bind(PipelineExpression pipeline, EmbeddedPipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/ToHashSetBinder.cs b/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/ToHashSetBinder.cs
@@ -25,7 +25,7 @@ internal sealed class ToHashSetBinder : IMethodCallBinder<EmbeddedPipelineBindin
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => MongoEnumerable.ToHashSet<int>(null));
+            yield return MethodHelper.GetMethodDefinition(() => MongoEnumerable.ToHashSet<object>(null));
         }
 
         public Expression Bind(PipelineExpression pipeline, EmbeddedPipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/UnionBinder.cs b/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/UnionBinder.cs
@@ -25,8 +25,8 @@ internal sealed class UnionBinder : IMethodCallBinder<EmbeddedPipelineBindingCon
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Union<int>(null, null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.Union<int>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Union<object>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.Union<object>(null, null));
         }
 
         public Expression Bind(PipelineExpression pipeline, EmbeddedPipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/WhereBinder.cs b/src/MongoDB.Driver/Linq/Processors/EmbeddedPipeline/MethodCallBinders/WhereBinder.cs
@@ -26,8 +26,8 @@ internal sealed class WhereBinder : IMethodCallBinder<EmbeddedPipelineBindingCon
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Where(null, (Func<int, bool>)null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.Where(null, (Expression<Func<int, bool>>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Where(null, (Func<object, bool>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.Where(null, (Expression<Func<object, bool>>)null));
         }
 
         public Expression Bind(PipelineExpression pipeline, EmbeddedPipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/DistinctBinder.cs b/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/DistinctBinder.cs
@@ -25,8 +25,8 @@ internal sealed class DistinctBinder : IMethodCallBinder<PipelineBindingContext>
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Distinct<int>(null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.Distinct<int>(null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Distinct<object>(null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.Distinct<object>(null));
         }
 
         public Expression Bind(PipelineExpression pipeline, PipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/GroupByBinder.cs b/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/GroupByBinder.cs
@@ -29,8 +29,8 @@ internal sealed class GroupByBinder : IMethodCallBinder<PipelineBindingContext>
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.GroupBy<int, int>(null, null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.GroupBy<int, int>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.GroupBy<object, object>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.GroupBy<object, object>(null, null));
         }
 
         public Expression Bind(PipelineExpression pipeline, PipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/GroupByWithResultSelectorBinder.cs b/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/GroupByWithResultSelectorBinder.cs
@@ -28,8 +28,8 @@ internal sealed class GroupByWithResultSelectorBinder : IMethodCallBinder<Pipeli
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.GroupBy(null, null, (Func<int, IEnumerable<int>, int>)null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.GroupBy(null, null, (Expression<Func<int, IEnumerable<int>, int>>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.GroupBy(null, null, (Func<object, IEnumerable<object>, object>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.GroupBy(null, null, (Expression<Func<object, IEnumerable<object>, object>>)null));
         }
 
         public Expression Bind(PipelineExpression pipeline, PipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/OrderByBinder.cs b/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/OrderByBinder.cs
@@ -25,10 +25,10 @@ internal sealed class OrderByBinder : IMethodCallBinder<PipelineBindingContext>
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.OrderBy<int, int>(null, null));
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.OrderByDescending<int, int>(null, null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.OrderBy<int, int>(null, null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.OrderByDescending<int, int>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.OrderBy<object, object>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.OrderByDescending<object, object>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.OrderBy<object, object>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.OrderByDescending<object, object>(null, null));
         }
 
         public Expression Bind(PipelineExpression pipeline, PipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/SelectBinder.cs b/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/SelectBinder.cs
@@ -26,8 +26,8 @@ internal sealed class SelectBinder : IMethodCallBinder<PipelineBindingContext>
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Select(null, (Func<int, int>)null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.Select(null, (Expression<Func<int, int>>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Select(null, (Func<object, object>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.Select(null, (Expression<Func<object, object>>)null));
         }
 
         public Expression Bind(PipelineExpression pipeline, PipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/SelectManyBinder.cs b/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/SelectManyBinder.cs
@@ -27,10 +27,10 @@ internal sealed class SelectManyBinder : IMethodCallBinder<PipelineBindingContex
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.SelectMany(null, (Func<int, IEnumerable<int>>)null));
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.SelectMany(null, (Func<int, IEnumerable<int>>)null, (Func<int, int, int>)null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.SelectMany(null, (Expression<Func<int, IEnumerable<int>>>)null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.SelectMany(null, (Expression<Func<int, IEnumerable<int>>>)null, (Expression<Func<int, int, int>>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.SelectMany(null, (Func<object, IEnumerable<object>>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.SelectMany(null, (Func<object, IEnumerable<object>>)null, (Func<object, object, object>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.SelectMany(null, (Expression<Func<object, IEnumerable<object>>>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.SelectMany(null, (Expression<Func<object, IEnumerable<object>>>)null, (Expression<Func<object, object, object>>)null));
         }
 
         public Expression Bind(PipelineExpression pipeline, PipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/ThenByBinder.cs b/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/ThenByBinder.cs
@@ -25,10 +25,10 @@ internal sealed class ThenByBinder : IMethodCallBinder<PipelineBindingContext>
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.ThenBy<int, int>(null, null));
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.ThenByDescending<int, int>(null, null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.ThenBy<int, int>(null, null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.ThenByDescending<int, int>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.ThenBy<object, object>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.ThenByDescending<object, object>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.ThenBy<object, object>(null, null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.ThenByDescending<object, object>(null, null));
         }
 
         public Expression Bind(PipelineExpression pipeline, PipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)
diff --git a/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/WhereBinder.cs b/src/MongoDB.Driver/Linq/Processors/Pipeline/MethodCallBinders/WhereBinder.cs
@@ -26,8 +26,8 @@ internal sealed class WhereBinder : IMethodCallBinder<PipelineBindingContext>
     {
         public static IEnumerable<MethodInfo> GetSupportedMethods()
         {
-            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Where(null, (Func<int, bool>)null));
-            yield return MethodHelper.GetMethodDefinition(() => Queryable.Where(null, (Expression<Func<int, bool>>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Enumerable.Where(null, (Func<object, bool>)null));
+            yield return MethodHelper.GetMethodDefinition(() => Queryable.Where(null, (Expression<Func<object, bool>>)null));
         }
 
         public Expression Bind(PipelineExpression pipeline, PipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ internal sealed class DistinctBinder : IMethodCallBinder<EmbeddedPipelineBinding`
`25`	`25`	`{`
`26`	`26`	`public static IEnumerable<MethodInfo> GetSupportedMethods()`
`27`	`27`	`{`
`28`		`- yield return MethodHelper.GetMethodDefinition(() => Enumerable.Distinct<int>(null));`
`29`		`- yield return MethodHelper.GetMethodDefinition(() => Queryable.Distinct<int>(null));`
	`28`	`+ yield return MethodHelper.GetMethodDefinition(() => Enumerable.Distinct<object>(null));`
	`29`	`+ yield return MethodHelper.GetMethodDefinition(() => Queryable.Distinct<object>(null));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public Expression Bind(PipelineExpression pipeline, EmbeddedPipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ internal sealed class SelectBinder : IMethodCallBinder<EmbeddedPipelineBindingCo`
`26`	`26`	`{`
`27`	`27`	`public static IEnumerable<MethodInfo> GetSupportedMethods()`
`28`	`28`	`{`
`29`		`- yield return MethodHelper.GetMethodDefinition(() => Enumerable.Select(null, (Func<int, int>)null));`
`30`		`- yield return MethodHelper.GetMethodDefinition(() => Queryable.Select(null, (Expression<Func<int, int>>)null));`
	`29`	`+ yield return MethodHelper.GetMethodDefinition(() => Enumerable.Select(null, (Func<object, object>)null));`
	`30`	`+ yield return MethodHelper.GetMethodDefinition(() => Queryable.Select(null, (Expression<Func<object, object>>)null));`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public Expression Bind(PipelineExpression pipeline, EmbeddedPipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ internal sealed class ToHashSetBinder : IMethodCallBinder<EmbeddedPipelineBindin`
`25`	`25`	`{`
`26`	`26`	`public static IEnumerable<MethodInfo> GetSupportedMethods()`
`27`	`27`	`{`
`28`		`- yield return MethodHelper.GetMethodDefinition(() => MongoEnumerable.ToHashSet<int>(null));`
	`28`	`+ yield return MethodHelper.GetMethodDefinition(() => MongoEnumerable.ToHashSet<object>(null));`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public Expression Bind(PipelineExpression pipeline, EmbeddedPipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ internal sealed class GroupByBinder : IMethodCallBinder<PipelineBindingContext>`
`29`	`29`	`{`
`30`	`30`	`public static IEnumerable<MethodInfo> GetSupportedMethods()`
`31`	`31`	`{`
`32`		`- yield return MethodHelper.GetMethodDefinition(() => Enumerable.GroupBy<int, int>(null, null));`
`33`		`- yield return MethodHelper.GetMethodDefinition(() => Queryable.GroupBy<int, int>(null, null));`
	`32`	`+ yield return MethodHelper.GetMethodDefinition(() => Enumerable.GroupBy<object, object>(null, null));`
	`33`	`+ yield return MethodHelper.GetMethodDefinition(() => Queryable.GroupBy<object, object>(null, null));`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public Expression Bind(PipelineExpression pipeline, PipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ internal sealed class GroupByWithResultSelectorBinder : IMethodCallBinder<Pipeli`
`28`	`28`	`{`
`29`	`29`	`public static IEnumerable<MethodInfo> GetSupportedMethods()`
`30`	`30`	`{`
`31`		`- yield return MethodHelper.GetMethodDefinition(() => Enumerable.GroupBy(null, null, (Func<int, IEnumerable<int>, int>)null));`
`32`		`- yield return MethodHelper.GetMethodDefinition(() => Queryable.GroupBy(null, null, (Expression<Func<int, IEnumerable<int>, int>>)null));`
	`31`	`+ yield return MethodHelper.GetMethodDefinition(() => Enumerable.GroupBy(null, null, (Func<object, IEnumerable<object>, object>)null));`
	`32`	`+ yield return MethodHelper.GetMethodDefinition(() => Queryable.GroupBy(null, null, (Expression<Func<object, IEnumerable<object>, object>>)null));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public Expression Bind(PipelineExpression pipeline, PipelineBindingContext bindingContext, MethodCallExpression node, IEnumerable<Expression> arguments)`