simplify connection

Author: SimonCropp

src/GraphQL.EntityFramework/GraphApi/EfGraphQLService_NavigationConnection.cs

@@ -11,7 +11,7 @@ namespace GraphQL.EntityFramework
     partial class EfGraphQLService<TDbContext>
         where TDbContext : DbContext
     {
-        MethodInfo addEnumerableConnection = typeof(EfGraphQLService<TDbContext>)
+        static MethodInfo addEnumerableConnection = typeof(EfGraphQLService<TDbContext>)
             .GetMethod("AddEnumerableConnection", BindingFlags.Instance| BindingFlags.NonPublic)!;
 
         public void AddNavigationConnectionField<TSource, TReturn>(
@@ -80,31 +80,5 @@ void AddEnumerableConnection<TSource, TGraph, TReturn>(
 
             field.AddWhereArgument(hasId, arguments);
         }
-
-        static void SetField(object builder, object fieldType)
-        {
-            var fieldTypeField = builder.GetType()
-                .GetProperty("FieldType", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
-            fieldTypeField.SetValue(builder, fieldType);
-        }
-
-        //TODO: can return null
-        static object GetFieldType<TSource>(string name, Type graphType)
-        {
-            var makeGenericType = typeof(ConnectionBuilder<>).MakeGenericType(typeof(TSource));
-            var genericMethodInfo = makeGenericType
-                .GetMethods()
-                .Single(method => method.Name == "Create" &&
-                                  method.IsGenericMethod &&
-                                  method.GetGenericArguments().Length == 1);
-            var genericMethod = genericMethodInfo.MakeGenericMethod(graphType);
-            dynamic? x = genericMethod.Invoke(null, new object[] { name }) ?? null;
-            x?.Bidirectional();
-            return x?.FieldType!;
-        }
-
-        class FakeGraph : GraphType
-        {
-        }
     }
 }

src/GraphQL.EntityFramework/GraphApi/EfGraphQLService_QueryableConnection.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using GraphQL.Builders;
 using GraphQL.Types;
 using Microsoft.EntityFrameworkCore;
@@ -10,6 +11,9 @@ namespace GraphQL.EntityFramework
     partial class EfGraphQLService<TDbContext>
         where TDbContext : DbContext
     {
+        static MethodInfo addQueryableConnection = typeof(EfGraphQLService<TDbContext>)
+            .GetMethod("AddQueryableConnection", BindingFlags.Instance| BindingFlags.NonPublic)!;
+
         public void AddQueryConnectionField<TReturn>(
             IComplexGraphType graph,
             string name,
@@ -20,7 +24,9 @@ public void AddQueryConnectionField<TReturn>(
             string? description = null)
             where TReturn : class
         {
-            BuildQueryConnectionField(graph, name, resolve, arguments, pageSize, itemGraphType, description);
+            itemGraphType ??= GraphTypeFinder.FindGraphType<TReturn>();
+            var addConnectionT = addQueryableConnection.MakeGenericMethod(typeof(object), itemGraphType, typeof(TReturn));
+            addConnectionT.Invoke(this, new object?[] { graph, name, resolve, arguments, pageSize, description });
         }
 
         public void AddQueryConnectionField<TSource, TReturn>(
@@ -33,27 +39,22 @@ public void AddQueryConnectionField<TSource, TReturn>(
             string? description = null)
             where TReturn : class
         {
-            BuildQueryConnectionField(graph, name, resolve, arguments, pageSize, itemGraphType, description);
+            itemGraphType ??= GraphTypeFinder.FindGraphType<TReturn>();
+            var addConnectionT = addQueryableConnection.MakeGenericMethod(typeof(TSource), itemGraphType, typeof(TReturn));
+            addConnectionT.Invoke(this, new object?[] { graph, name, resolve, arguments, pageSize, description });
         }
 
-        void BuildQueryConnectionField<TSource, TReturn>(
+        void AddQueryableConnection<TSource, TGraph, TReturn>(
             IComplexGraphType graph,
             string name,
             Func<ResolveEfFieldContext<TDbContext, TSource>, IQueryable<TReturn>>? resolve,
             IEnumerable<QueryArgument>? arguments,
             int pageSize,
-            Type? itemGraphType,
             string? description)
+            where TGraph : IGraphType
             where TReturn : class
         {
-            Guard.AgainstWhiteSpace(nameof(name), name);
-            Guard.AgainstNegative(nameof(pageSize), pageSize);
-
-            itemGraphType ??= GraphTypeFinder.FindGraphType<TReturn>();
-            var fieldType = GetFieldType<TSource>(name, itemGraphType);
-
-            var builder = ConnectionBuilder<TSource>.Create<FakeGraph>(name);
-            SetField(builder, fieldType);
+            var builder = ConnectionBuilder<TSource>.Create<TGraph>(name);
             if (description != null)
             {
                 builder.Description(description);