Group runtime methods in HttpParameterResolver

Author: C0nquistadore

src/Dibix.Http.Server/Runtime/HttpParameterResolver.cs

@@ -774,20 +774,6 @@ private static Expression BuildNestedEnumerableSelector(Expression source, Param
             return call;
         }
 
-        private static IEnumerable<NestedEnumerablePair<TParent, TChild>> FlattenNestedEnumerable<TParent, TChild>(IEnumerable<TParent> source, Func<TParent, IEnumerable<TChild>> collectionSelector)
-        {
-            int parentIndex = 1;
-            foreach (TParent parent in source)
-            {
-                int childIndex = 1;
-                foreach (TChild child in collectionSelector(parent))
-                {
-                    yield return new NestedEnumerablePair<TParent, TChild>(parentIndex, childIndex++, parent, child);
-                }
-                parentIndex++;
-            }
-        }
-
         private static MethodInfo GetStructuredTypeAddMethod(Type type)
         {
             MethodInfo addMethod = type.SafeGetMethod("Add", BindingFlags.Public | BindingFlags.Instance);
@@ -832,6 +818,80 @@ private static void CollectApiParameters(HttpParameterResolutionMethod method, I
                 method.AddParameter(parameter.ApiParameterName, parameter.ParameterType, parameter.Location, parameter.IsOptional);
         }
 
+        private static bool IsUri(HttpParameterLocation location) => location is HttpParameterLocation.Query or HttpParameterLocation.Path;
+
+        private static Exception CreateException(string message, Exception innerException, IHttpActionDescriptor action, string parameterName)
+        {
+            StringBuilder sb = new StringBuilder(message);
+            if (action != null)
+            {
+                sb.AppendLine()
+                  .Append("at ")
+                  .Append(action.Method.ToString().ToUpperInvariant())
+                  .Append(' ')
+                  .Append(action.Uri);
+            }
+
+            if (parameterName != null)
+            {
+                sb.AppendLine()
+                  .Append("Parameter: ")
+                  .Append(parameterName);
+
+                if (action != null && action.TryGetParameter(parameterName, out HttpParameterSource source))
+                {
+                    sb.AppendLine()
+                      .Append("Source: ")
+                      .Append(source.Description);
+                }
+            }
+
+            return new InvalidOperationException(sb.ToString(), innerException);
+        }
+
+        private static MethodInfo GetStructuredTypeFactoryMethod(Type implementationType, Type itemType, bool withIndex)
+        {
+            foreach (MethodInfo method in typeof(StructuredType<>).MakeGenericType(implementationType).GetRuntimeMethods())
+            {
+                if (method.Name != "From")
+                    continue;
+
+                IList<ParameterInfo> parameters = method.GetParameters();
+                if (parameters.Count != 2)
+                    continue;
+
+                if (parameters[0].ParameterType.GetGenericTypeDefinition() == typeof(IEnumerable<>)
+                 && parameters[1].ParameterType.GetGenericTypeDefinition() == (withIndex ? typeof(Action<,,>) : typeof(Action<,>)))
+                {
+                    return method.MakeGenericMethod(itemType);
+                }
+            }
+            throw new InvalidOperationException("Could not find structured type factory method 'StructuredType<>.From()'");
+        }
+
+        private static Type TryGetEnumerableType(Type type)
+        {
+            if (!type.IsGenericType)
+                return null;
+
+            if (type.GetInterfaces().All(x => x.GetGenericTypeDefinition() != typeof(IEnumerable<>)))
+                return null;
+
+            return type.GenericTypeArguments[0];
+
+        }
+
+        private static Type GetEnumerableType(Type type)
+        {
+            Type itemType = TryGetEnumerableType(type);
+            if (itemType == null)
+                throw new InvalidOperationException($"Type does not implement IEnumerable<>: {type}");
+
+            return itemType;
+        }
+        #endregion
+
+        #region Runtime methods used by generated LINQ expression tree
         private static void AddParameterFromBody<TSource, TTarget, TConverter>(IDictionary<string, object> arguments, string parameterName) where TConverter : IFormattedInputConverter<TSource, TTarget>, new()
         {
             TTarget target = ConvertParameterFromBody<TSource, TTarget, TConverter>(arguments);
@@ -853,21 +913,6 @@ private static void CollectApiParameters(HttpParameterResolutionMethod method, I
             return target;
         }
 
-        private static IEnumerable<string> GetClaimValues(ClaimsPrincipal principal, string claimType)
-        {
-            IEnumerable<string> values = principal.Claims
-                                                  .Where(x => x.Type == claimType)
-                                                  .Select(x => x.Value);
-            return values;
-        }
-
-        private static string GetClaimValue(ClaimsPrincipal principal, string claimType)
-        {
-            IEnumerable<string> values = GetClaimValues(principal, claimType);
-            string value = values.FirstOrDefault();
-            return value;
-        }
-
         private static TTarget ConvertValue<TSource, TTarget>(string parameterName, TSource value, IHttpActionDescriptor action)
         {
             try
@@ -909,76 +954,33 @@ private static TTarget ConvertValue<TSource, TTarget>(string parameterName, TSou
             }
         }
 
-        private static bool IsUri(HttpParameterLocation location) => location is HttpParameterLocation.Query or HttpParameterLocation.Path;
-
-        private static Exception CreateException(string message, Exception innerException, IHttpActionDescriptor action, string parameterName)
-        {
-            StringBuilder sb = new StringBuilder(message);
-            if (action != null)
-            {
-                sb.AppendLine()
-                  .Append("at ")
-                  .Append(action.Method.ToString().ToUpperInvariant())
-                  .Append(' ')
-                  .Append(action.Uri);
-            }
-
-            if (parameterName != null)
-            {
-                sb.AppendLine()
-                  .Append("Parameter: ")
-                  .Append(parameterName);
-
-                if (action != null && action.TryGetParameter(parameterName, out HttpParameterSource source))
-                {
-                    sb.AppendLine()
-                      .Append("Source: ")
-                      .Append(source.Description);
-                }
-            }
-
-            return new InvalidOperationException(sb.ToString(), innerException);
-        }
-
-        private static MethodInfo GetStructuredTypeFactoryMethod(Type implementationType, Type itemType, bool withIndex)
+        private static IEnumerable<NestedEnumerablePair<TParent, TChild>> FlattenNestedEnumerable<TParent, TChild>(IEnumerable<TParent> source, Func<TParent, IEnumerable<TChild>> collectionSelector)
         {
-            foreach (MethodInfo method in typeof(StructuredType<>).MakeGenericType(implementationType).GetRuntimeMethods())
+            int parentIndex = 1;
+            foreach (TParent parent in source)
             {
-                if (method.Name != "From")
-                    continue;
-
-                IList<ParameterInfo> parameters = method.GetParameters();
-                if (parameters.Count != 2)
-                    continue;
-
-                if (parameters[0].ParameterType.GetGenericTypeDefinition() == typeof(IEnumerable<>)
-                 && parameters[1].ParameterType.GetGenericTypeDefinition() == (withIndex ? typeof(Action<,,>) : typeof(Action<,>)))
+                int childIndex = 1;
+                foreach (TChild child in collectionSelector(parent))
                 {
-                    return method.MakeGenericMethod(itemType);
+                    yield return new NestedEnumerablePair<TParent, TChild>(parentIndex, childIndex++, parent, child);
                 }
+                parentIndex++;
             }
-            throw new InvalidOperationException("Could not find structured type factory method 'StructuredType<>.From()'");
         }
 
-        private static Type TryGetEnumerableType(Type type)
+        private static string GetClaimValue(ClaimsPrincipal principal, string claimType)
         {
-            if (!type.IsGenericType)
-                return null;
-
-            if (type.GetInterfaces().All(x => x.GetGenericTypeDefinition() != typeof(IEnumerable<>)))
-                return null;
-
-            return type.GenericTypeArguments[0];
-
+            IEnumerable<string> values = GetClaimValues(principal, claimType);
+            string value = values.FirstOrDefault();
+            return value;
         }
 
-        private static Type GetEnumerableType(Type type)
+        private static IEnumerable<string> GetClaimValues(ClaimsPrincipal principal, string claimType)
         {
-            Type itemType = TryGetEnumerableType(type);
-            if (itemType == null)
-                throw new InvalidOperationException($"Type does not implement IEnumerable<>: {type}");
-
-            return itemType;
+            IEnumerable<string> values = principal.Claims
+                                                  .Where(x => x.Type == claimType)
+                                                  .Select(x => x.Value);
+            return values;
         }
         #endregion