Moved the Field declaration for shared resolvers to the non-generic…

… object type descriptor.
ChilliCream · Dec 6, 2018 · 811829a · 811829a
1 parent 70ca8ef
commit 811829a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 41 deletions.
diff --git a/src/Types/Types/Descriptors/IObjectTypeDescriptor.cs b/src/Types/Types/Descriptors/IObjectTypeDescriptor.cs
@@ -70,6 +70,17 @@ IObjectTypeDescriptor Interface<T>()
         /// </param>
         IObjectFieldDescriptor Field(NameString name);
 
+        /// <summary>
+        /// Specifies an object type field which is bound to a resolver type.
+        /// </summary>
+        /// <param name="propertyOrMethod">
+        /// An expression selecting a property or method of
+        /// <typeparamref name="TResolver"/>.
+        /// The resolver type containing the property or method.
+        /// </param>
+        IObjectFieldDescriptor Field<TResolver>(
+            Expression<Func<TResolver, object>> propertyOrMethod);
+
         IObjectTypeDescriptor Directive<T>(T directive)
             where T : class;
 
@@ -156,17 +167,6 @@ public interface IObjectTypeDescriptor<T>
         IObjectFieldDescriptor Field(
             Expression<Func<T, object>> propertyOrMethod);
 
-        /// <summary>
-        /// Specifies an object type field which is bound to a resolver type.
-        /// </summary>
-        /// <param name="propertyOrMethod">
-        /// An expression selecting a property or method of
-        /// <typeparamref name="TResolver"/>.
-        /// The resolver type containing the property or method.
-        /// </param>
-        IObjectFieldDescriptor Field<TResolver>(
-            Expression<Func<TResolver, object>> propertyOrMethod);
-
         new IObjectTypeDescriptor<T> Directive<TDirective>(TDirective directive)
             where TDirective : class;
 

diff --git a/src/Types/Types/Descriptors/ObjectTypeDescriptor.cs b/src/Types/Types/Descriptors/ObjectTypeDescriptor.cs
@@ -138,6 +138,30 @@ protected ObjectFieldDescriptor Field(NameString name)
             return fieldDescriptor;
         }
 
+        protected ObjectFieldDescriptor Field<TResolver>(
+            Expression<Func<TResolver, object>> propertyOrMethod)
+        {
+            if (propertyOrMethod == null)
+            {
+                throw new ArgumentNullException(nameof(propertyOrMethod));
+            }
+
+            MemberInfo member = propertyOrMethod.ExtractMember();
+            if (member is PropertyInfo || member is MethodInfo)
+            {
+                ObjectFieldDescriptor fieldDescriptor =
+                    CreateResolverDescriptor(
+                        ObjectDescription.ClrType,
+                        typeof(TResolver), member);
+                Fields.Add(fieldDescriptor);
+                return fieldDescriptor;
+            }
+
+            throw new ArgumentException(
+                "A field of an entity can only be a property or a method.",
+                nameof(member));
+        }
+
         protected void AddResolverTypes(
             IDictionary<string, ObjectFieldDescription> fields)
         {
@@ -295,6 +319,12 @@ IObjectFieldDescriptor IObjectTypeDescriptor.Field(NameString name)
             return Field(name);
         }
 
+        IObjectFieldDescriptor IObjectTypeDescriptor.Field<TResolver>(
+            Expression<Func<TResolver, object>> propertyOrMethod)
+        {
+            return Field(propertyOrMethod);
+        }
+
         IObjectTypeDescriptor IObjectTypeDescriptor.Directive<T>(T directive)
         {
             ObjectDescription.Directives.AddDirective(directive);
@@ -341,30 +371,6 @@ protected void BindFields(BindingBehavior bindingBehavior)
             ObjectDescription.FieldBindingBehavior = bindingBehavior;
         }
 
-        protected ObjectFieldDescriptor Field<TResolver>(
-           Expression<Func<TResolver, object>> propertyOrMethod)
-        {
-            if (propertyOrMethod == null)
-            {
-                throw new ArgumentNullException(nameof(propertyOrMethod));
-            }
-
-            MemberInfo member = propertyOrMethod.ExtractMember();
-            if (member is PropertyInfo || member is MethodInfo)
-            {
-                ObjectFieldDescriptor fieldDescriptor =
-                    CreateResolverDescriptor(
-                        ObjectDescription.ClrType,
-                        typeof(TResolver), member);
-                Fields.Add(fieldDescriptor);
-                return fieldDescriptor;
-            }
-
-            throw new ArgumentException(
-                "A field of an entity can only be a property or a method.",
-                nameof(member));
-        }
-
         protected override void OnCompleteFields(
             IDictionary<string, ObjectFieldDescription> fields,
             ISet<MemberInfo> handledMembers)
@@ -461,12 +467,6 @@ IObjectFieldDescriptor IObjectTypeDescriptor<T>.Field(
             return Field(propertyOrMethod);
         }
 
-        IObjectFieldDescriptor IObjectTypeDescriptor<T>.Field<TResolver>(
-            Expression<Func<TResolver, object>> propertyOrMethod)
-        {
-            return Field(propertyOrMethod);
-        }
-
         IObjectTypeDescriptor<T> IObjectTypeDescriptor<T>.Directive<TDirective>(
             TDirective directive)
         {