diff --git a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor.cs b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor.cs index 92325dde6f9..b31e97afe4d 100644 --- a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor.cs +++ b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor.cs @@ -26,7 +26,7 @@ public interface INodeDescriptor : IDescriptor NodeResolverDelegate fieldResolver); IObjectFieldDescriptor ResolveNodeWith( - Expression> method); + Expression> method); IObjectFieldDescriptor ResolveNodeWith(); diff --git a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor~1.cs b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor~1.cs index df4f7ebdadf..b44cf1fbe44 100644 --- a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor~1.cs +++ b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor~1.cs @@ -29,7 +29,7 @@ public interface INodeDescriptor : IDescriptor NodeResolverDelegate fieldResolver); IObjectFieldDescriptor ResolveNodeWith( - Expression> method); + Expression> method); IObjectFieldDescriptor ResolveNodeWith(); diff --git a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor~2.cs b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor~2.cs index fa38c7fb337..101423604fa 100644 --- a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor~2.cs +++ b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/INodeDescriptor~2.cs @@ -20,7 +20,7 @@ public interface INodeDescriptor : IDescriptor NodeResolverDelegate fieldResolver); IObjectFieldDescriptor ResolveNodeWith( - Expression> method); + Expression> method); IObjectFieldDescriptor ResolveNodeWith(); diff --git a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor.cs b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor.cs index 4993a5164be..aaae1a77c4f 100644 --- a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor.cs +++ b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor.cs @@ -76,11 +76,11 @@ public INodeDescriptor IdField(MemberInfo propertyOrMethod) public IObjectFieldDescriptor ResolveNodeWith() => ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod( Definition.NodeType ?? typeof(TResolver), - typeof(TResolver))); + typeof(TResolver))!); public IObjectFieldDescriptor ResolveNodeWith(Type type) => ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod( Definition.NodeType ?? type, - type)); + type)!); } } diff --git a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptorBase.cs b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptorBase.cs index dc94f5066b0..fdeeb5de9df 100644 --- a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptorBase.cs +++ b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptorBase.cs @@ -55,7 +55,7 @@ protected NodeDescriptorBase(IDescriptorContext context) } public IObjectFieldDescriptor ResolveNodeWith( - Expression> method) + Expression> method) { if (method is null) { diff --git a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~1.cs b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~1.cs index 073c1534e81..a6a306e77f8 100644 --- a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~1.cs +++ b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~1.cs @@ -108,38 +108,14 @@ public INodeDescriptor IdField(MemberInfo propertyOrMethod) ResolveNode( async (ctx, id) => (await nodeResolver(ctx, id).ConfigureAwait(false))!); - public IObjectFieldDescriptor ResolveNodeWith( - Expression> method) - { - if (method is null) - { - throw new ArgumentNullException(nameof(method)); - } - - MemberInfo member = method.TryExtractMember(); - - if (member is MethodInfo m) - { - FieldResolver resolver = - ResolverCompiler.Resolve.Compile( - new ResolverDescriptor( - typeof(TResolver), - typeof(object), - new FieldMember("_", "_", m))); - return ResolveNode(resolver.Resolver); - } - - throw new ArgumentException(NodeDescriptor_MustBeMethod, nameof(member)); - } - public IObjectFieldDescriptor ResolveNodeWith() => ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod( typeof(TNode), - typeof(TResolver))); + typeof(TResolver))!); public IObjectFieldDescriptor ResolveNodeWith(Type type) => ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod( typeof(TNode), - type)); + type)!); } } diff --git a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~2.cs b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~2.cs index 4b7e1baa9f4..f530fc347fb 100644 --- a/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~2.cs +++ b/src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~2.cs @@ -57,7 +57,7 @@ public class NodeDescriptor : INodeDescriptor }); public IObjectFieldDescriptor ResolveNodeWith( - Expression> method) + Expression> method) { if (method is null) { @@ -102,11 +102,11 @@ public class NodeDescriptor : INodeDescriptor public IObjectFieldDescriptor ResolveNodeWith() => ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod( typeof(TNode), - typeof(TResolver))); + typeof(TResolver))!); public IObjectFieldDescriptor ResolveNodeWith(Type type) => ResolveNodeWith(Context.TypeInspector.GetNodeResolverMethod( typeof(TNode), - type)); + type)!); } }