Simplify MethodFinder.GetAllInstanceMethods

Outside of the test suite, this method only gets called to find both
public and non-public instance methods; the `flags` parameter is there-
fore in essence constant and can be optimized away, along with several
assertions, tests, and the `MakeFilteredCopy` method.

Author: stakx

src/Castle.Core.Tests/DynamicProxy.Tests/GenericInterfaceProxyTestCase.cs

@@ -16,7 +16,6 @@ namespace Castle.DynamicProxy.Tests
 {
 	using System;
 	using System.Collections.Generic;
-	using System.Reflection;
 
 	using Castle.DynamicProxy.Generators;
 	using Castle.DynamicProxy.Tests.GenInterfaces;
@@ -418,8 +417,7 @@ public void TypeGetMethodsIsStable()
 		public void MethodFinderIsStable()
 		{
 			ProxyWithGenInterfaceWithBase();
-			Assert.AreEqual(4, MethodFinder.GetAllInstanceMethods(
-				typeof(IGenInterfaceHierarchyBase<int>), BindingFlags.Public | BindingFlags.Instance).Length);
+			Assert.AreEqual(4, MethodFinder.GetAllInstanceMethods(typeof(IGenInterfaceHierarchyBase<int>)).Length);
 		}
 
 #if FEATURE_APPDOMAIN

src/Castle.Core.Tests/DynamicProxy.Tests/MethodFinderTestCase.cs

@@ -14,9 +14,6 @@
 
 namespace Castle.DynamicProxy.Tests
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
 	using System.Reflection;
 
 	using Castle.DynamicProxy.Generators;
@@ -26,51 +23,14 @@ namespace Castle.DynamicProxy.Tests
 	[TestFixture]
 	public class MethodFinderTestCase
 	{
-		[Test]
-		public void GetMethodsForPublic()
-		{
-			MethodInfo[] methods =
-				MethodFinder.GetAllInstanceMethods(typeof(object), BindingFlags.Instance | BindingFlags.Public);
-			MethodInfo[] realMethods = typeof(object).GetMethods(BindingFlags.Instance | BindingFlags.Public);
-			CollectionAssert.AreEquivalent(realMethods, methods);
-		}
-
-		[Test]
-		public void GetMethodsForNonPublic()
-		{
-			MethodInfo[] methods =
-				MethodFinder.GetAllInstanceMethods(typeof(object), BindingFlags.Instance | BindingFlags.NonPublic);
-			MethodInfo[] realMethods = typeof(object).GetMethods(BindingFlags.Instance | BindingFlags.NonPublic);
-			CollectionAssert.AreEquivalent(realMethods, methods);
-		}
-
 		[Test]
 		public void GetMethodsForPublicAndNonPublic()
 		{
 			MethodInfo[] methods =
-				MethodFinder.GetAllInstanceMethods(typeof(object),
-												   BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+				MethodFinder.GetAllInstanceMethods(typeof(object));
 			MethodInfo[] realMethods =
 				typeof(object).GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
 			CollectionAssert.AreEquivalent(realMethods, methods);
 		}
-
-		[Test]
-		public void GetMethodsThrowsOnStatic()
-		{
-			Assert.Throws<ArgumentException>(() =>
-				MethodFinder.GetAllInstanceMethods(typeof(object),
-					BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public)
-			);
-		}
-
-		[Test]
-		public void GetMethodsThrowsOnOtherFlags()
-		{
-			Assert.Throws<ArgumentException>(() =>
-				MethodFinder.GetAllInstanceMethods(typeof(object),
-					BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
-			);
-		}
 	}
 }

src/Castle.Core/DynamicProxy/Contributors/MembersCollector.cs

@@ -72,7 +72,7 @@ void CollectEvents()
 
 			void CollectMethods()
 			{
-				var methodsFound = MethodFinder.GetAllInstanceMethods(type, Flags);
+				var methodsFound = MethodFinder.GetAllInstanceMethods(type);
 				foreach (var method in methodsFound)
 				{
 					AddMethod(method, true);

src/Castle.Core/DynamicProxy/Generators/MethodFinder.cs

@@ -28,20 +28,14 @@ internal class MethodFinder
 		private static readonly Dictionary<Type, MethodInfo[]> cachedMethodInfosByType = new Dictionary<Type, MethodInfo[]>();
 		private static readonly object lockObject = new object();
 
-		public static MethodInfo[] GetAllInstanceMethods(Type type, BindingFlags flags)
+		public static MethodInfo[] GetAllInstanceMethods(Type type)
 		{
-			if ((flags & ~(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) != 0)
-			{
-				throw new ArgumentException("MethodFinder only supports the Public, NonPublic, and Instance binding flags.", nameof(flags));
-			}
-
 			MethodInfo[] methodsInCache;
 
 			lock (lockObject)
 			{
 				if (!cachedMethodInfosByType.TryGetValue(type, out methodsInCache))
 				{
-					// We always load all instance methods into the cache, we will filter them later
 					methodsInCache = type.GetMethods(
 							BindingFlags.Public | BindingFlags.NonPublic
 						    | BindingFlags.Instance)
@@ -52,32 +46,7 @@ public static MethodInfo[] GetAllInstanceMethods(Type type, BindingFlags flags)
 						methodsInCache);
 				}
 			}
-			return MakeFilteredCopy(methodsInCache, flags & (BindingFlags.Public | BindingFlags.NonPublic));
+			return methodsInCache;
 		}
-
-		private static MethodInfo[] MakeFilteredCopy(MethodInfo[] methodsInCache, BindingFlags visibilityFlags)
-		{
-			if ((visibilityFlags & ~(BindingFlags.Public | BindingFlags.NonPublic)) != 0)
-			{
-				throw new ArgumentException("Only supports BindingFlags.Public and NonPublic.", nameof(visibilityFlags));
-			}
-
-			var includePublic = (visibilityFlags & BindingFlags.Public) == BindingFlags.Public;
-			var includeNonPublic = (visibilityFlags & BindingFlags.NonPublic) == BindingFlags.NonPublic;
-
-			// Return a copy of the cached array, only returning the public methods unless requested otherwise
-			var result = new List<MethodInfo>(methodsInCache.Length);
-
-			foreach (var method in methodsInCache)
-			{
-				if ((method.IsPublic && includePublic) || (!method.IsPublic && includeNonPublic))
-				{
-					result.Add(method);
-				}
-			}
-
-			return result.ToArray();
-		}
-
 	}
 }

src/Castle.Core/DynamicProxy/Internal/InvocationHelper.cs

@@ -73,7 +73,7 @@ private static MethodInfo ObtainMethod(MethodInfo proxiedMethod, Type type)
 			else
 			{
 				// NOTE: this implementation sucks, feel free to improve it.
-				var methods = MethodFinder.GetAllInstanceMethods(type, BindingFlags.Public | BindingFlags.NonPublic);
+				var methods = MethodFinder.GetAllInstanceMethods(type);
 				foreach (var method in methods)
 				{
 					if (MethodSignatureComparer.Instance.Equals(method.GetBaseDefinition(), proxiedMethod))