GraphQL 7 (#685)

SimonCropp · web-flow · commit 29e52606f5dd · 2022-08-17T15:12:20.000+10:00
diff --git a/readme.md b/readme.md
@@ -210,26 +210,20 @@ public class Query :
     ObjectGraphType
 {
     public Query() =>
-        Field<ResultGraph>(
-            "inputQuery",
-            arguments: new(
-                new QueryArgument<MyInputGraph>
+        Field<ResultGraph>("inputQuery")
+            .Argument<MyInputGraph>("input")
+            .Resolve(context =>
                 {
-                    Name = "input"
+                    var input = context.GetValidatedArgument<MyInput>("input");
+                    return new Result
+                    {
+                        Data = input.Content
+                    };
                 }
-            ),
-            resolve: context =>
-            {
-                var input = context.GetValidatedArgument<MyInput>("input");
-                return new Result
-                {
-                    Data = input.Content
-                };
-            }
-        );
+            );
 }
 ```
-<sup><a href='/src/SampleWeb/Query.cs#L4-L29' title='Snippet source file'>snippet source</a> | <a href='#snippet-getvalidatedargument' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/SampleWeb/Query.cs#L4-L23' title='Snippet source file'>snippet source</a> | <a href='#snippet-getvalidatedargument' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>7.2.1</Version>
+    <Version>8.0.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>GraphQL, Validation, FluentValidation</PackageTags>
     <Description>Add FluentValidation (https://fluentvalidation.net/) support to GraphQL.net (https://github.com/graphql-dotnet/graphql-dotnet)</Description>
diff --git a/src/GraphQL.FluentValidation/GraphQL.FluentValidation.csproj b/src/GraphQL.FluentValidation/GraphQL.FluentValidation.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="11.2.0" />
-    <PackageReference Include="GraphQL" Version="5.3.3" />
+    <PackageReference Include="GraphQL" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="ProjectDefaults" Version="1.0.80" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
diff --git a/src/SampleWeb.Tests/GraphQLControllerTests.RunQuery.verified.txt b/src/SampleWeb.Tests/GraphQLControllerTests.RunQuery.verified.txt
@@ -3,7 +3,7 @@
   Status: 200 OK,
   Content: {
     Headers: {
-      Content-Type: application/json
+      Content-Type: application/graphql+json; charset=utf-8
     },
     Value: {
       data: {
diff --git a/src/SampleWeb.Tests/SampleWeb.Tests.csproj b/src/SampleWeb.Tests/SampleWeb.Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Verify.DiffPlex" Version="1.3.0" />
-    <PackageReference Include="GraphQL" Version="5.3.3" />
+    <PackageReference Include="GraphQL" Version="7.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.8" />
     <PackageReference Include="Xunit" Version="2.4.2" />
     <PackageReference Include="Verify.Xunit" Version="17.10.2" />
diff --git a/src/SampleWeb/Query.cs b/src/SampleWeb/Query.cs
@@ -7,23 +7,17 @@ public class Query :
     ObjectGraphType
 {
     public Query() =>
-        Field<ResultGraph>(
-            "inputQuery",
-            arguments: new(
-                new QueryArgument<MyInputGraph>
+        Field<ResultGraph>("inputQuery")
+            .Argument<MyInputGraph>("input")
+            .Resolve(context =>
                 {
-                    Name = "input"
+                    var input = context.GetValidatedArgument<MyInput>("input");
+                    return new Result
+                    {
+                        Data = input.Content
+                    };
                 }
-            ),
-            resolve: context =>
-            {
-                var input = context.GetValidatedArgument<MyInput>("input");
-                return new Result
-                {
-                    Data = input.Content
-                };
-            }
-        );
+            );
 }
 
 #endregion
diff --git a/src/SampleWeb/SampleWeb.csproj b/src/SampleWeb/SampleWeb.csproj
@@ -4,12 +4,12 @@
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="wwwroot\" />
-    <PackageReference Include="GraphQL" Version="5.3.3" />
-    <PackageReference Include="GraphQL.MicrosoftDI" Version="5.3.3" />
+    <PackageReference Include="GraphQL" Version="7.0.1" />
+    <PackageReference Include="GraphQL.MicrosoftDI" Version="7.0.1" />
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.2.0" />
-    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="6.1.1" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.3.3" />
-    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="6.1.1" />
+    <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="7.0.0" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="7.0.1" />
+    <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="7.0.0" />
     <ProjectReference Include="..\GraphQL.FluentValidation\GraphQL.FluentValidation.csproj" />
     <PackageReference Include="ProjectDefaults" Version="1.0.80" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/SampleWeb/Startup.cs b/src/SampleWeb/Startup.cs
@@ -1,8 +1,5 @@
 ﻿using FluentValidation;
 using GraphQL;
-using GraphQL.MicrosoftDI;
-using GraphQL.Server;
-using GraphQL.SystemTextJson;
 using GraphQL.Types;
 
 public class Startup
@@ -16,7 +13,6 @@ public void ConfigureServices(IServiceCollection services)
 
         services.AddValidatorsFromAssemblyContaining<Startup>();
         services.AddGraphQL(builder => builder
-            .AddHttpMiddleware<Schema>()
             .AddSchema<Schema>()
             .ConfigureExecutionOptions(options =>
             {
diff --git a/src/Tests/Arguments/ComplexInputInnerGraph.cs b/src/Tests/Arguments/ComplexInputInnerGraph.cs
@@ -4,7 +4,6 @@ public class ComplexInputInnerGraph :
     InputObjectGraphType<ComplexInputInner>
 {
     public ComplexInputInnerGraph() =>
-        Field<StringGraphType, string?>()
-            .Name("content")
+        Field<StringGraphType, string?>("content")
             .Resolve(ctx => ctx.Source.Content);
 }
diff --git a/src/Tests/Arguments/ComplexInputListItemGraph.cs b/src/Tests/Arguments/ComplexInputListItemGraph.cs
@@ -5,12 +5,10 @@ public class ComplexInputListItemGraph :
 {
     public ComplexInputListItemGraph()
     {
-        Field<NonNullGraphType<IntGraphType>>()
-            .Name("id")
+        Field<NonNullGraphType<IntGraphType>>("id")
             .Resolve(ctx => ctx.Source.Id);
 
-        Field<StringGraphType, string?>()
-            .Name("content")
+        Field<StringGraphType, string?>("content")
             .Resolve(ctx => ctx.Source.Content);
     }
 }
diff --git a/src/Tests/Query.cs b/src/Tests/Query.cs
@@ -7,81 +7,75 @@ public class Query :
 {
     public Query()
     {
-        Field<ResultGraph>(
-            "noValidatorQuery",
-            arguments: new(new QueryArgument<NoValidatorInputGraph> { Name = "input"}),
-            resolve: context =>
-            {
-                var input = context.GetValidatedArgument<NoValidatorInput?>("input");
-                return new Result
+        Field<ResultGraph>("noValidatorQuery")
+            .Argument<NoValidatorInputGraph>("input")
+            .Resolve(context =>
                 {
-                    Data = input?.Content ?? "it was null"
-                };
-            }
-        );
-        Field<ResultGraph>(
-            "inputQuery",
-            arguments: new(new QueryArgument<InputGraph> { Name = "input"}),
-            resolve: context =>
-            {
-                var input = context.GetValidatedArgument<Input?>("input");
-                return new Result
+                    var input = context.GetValidatedArgument<NoValidatorInput?>("input");
+                    return new Result
+                    {
+                        Data = input?.Content ?? "it was null"
+                    };
+                }
+            );
+        Field<ResultGraph>("inputQuery")
+            .Argument<InputGraph>("input")
+            .Resolve(context =>
                 {
-                    Data = input?.Content ?? "it was null"
-                };
-            }
-        );
+                    var input = context.GetValidatedArgument<Input?>("input");
+                    return new Result
+                    {
+                        Data = input?.Content ?? "it was null"
+                    };
+                }
+            );
 
-        Field<ResultGraph>(
-            "complexInputQuery",
-            arguments: new(new QueryArgument<ComplexInputGraph> { Name = "input" }),
-            resolve: context =>
-            {
-                var input = context.GetValidatedArgument<ComplexInput>("input");
-                return new Result
+        Field<ResultGraph>("complexInputQuery")
+            .Argument<ComplexInputGraph>("input")
+            .Resolve(context =>
                 {
-                    Data = JsonConvert.SerializeObject(input)
-                };
-            }
-        );
+                    var input = context.GetValidatedArgument<ComplexInput>("input");
+                    return new Result
+                    {
+                        Data = JsonConvert.SerializeObject(input)
+                    };
+                }
+            );
 
-        Field<ResultGraph>(
-            "derivedComplexInputQuery",
-            arguments: new(new QueryArgument<DerivedComplexInputGraph> { Name = "input" }),
-            resolve: context =>
-            {
-                var input = context.GetValidatedArgument<DerivedComplexInput>("input");
-                return new Result
+        Field<ResultGraph>("derivedComplexInputQuery")
+            .Argument<DerivedComplexInputGraph>("input")
+            .Resolve(context =>
                 {
-                    Data = JsonConvert.SerializeObject(input)
-                };
-            }
-        );
+                    var input = context.GetValidatedArgument<DerivedComplexInput>("input");
+                    return new Result
+                    {
+                        Data = JsonConvert.SerializeObject(input)
+                    };
+                }
+            );
 
-        FieldAsync<ResultGraph>(
-            "asyncQuery",
-            arguments: new(new QueryArgument<InputGraph> { Name = "input" }),
-            resolve: async context =>
-            {
-                var input = await context.GetValidatedArgumentAsync<AsyncInput>("input");
-                return new Result
+        Field<ResultGraph>("asyncQuery")
+            .Argument<InputGraph>("input")
+            .ResolveAsync(async context =>
                 {
-                    Data = input.Content
-                };
-            }
-        );
+                    var input = await context.GetValidatedArgumentAsync<AsyncInput>("input");
+                    return new Result
+                    {
+                        Data = input.Content
+                    };
+                }
+            );
 
-        FieldAsync<ResultGraph>(
-            "asyncComplexInputQuery",
-            arguments: new(new QueryArgument<ComplexInputGraph> { Name = "input" }),
-            resolve: async context =>
-            {
-                var input = await context.GetValidatedArgumentAsync<AsyncComplexInput>("input");
-                return new Result
+        Field<ResultGraph>("asyncComplexInputQuery")
+            .Argument<ComplexInputGraph>("input")
+            .ResolveAsync(async context =>
                 {
-                    Data = input.Inner!.Content
-                };
-            }
-        );
+                    var input = await context.GetValidatedArgumentAsync<AsyncComplexInput>("input");
+                    return new Result
+                    {
+                        Data = input.Inner!.Content
+                    };
+                }
+            );
     }
 }
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="11.2.0" />
-    <PackageReference Include="GraphQL.SystemTextJson" Version="5.3.3" />
+    <PackageReference Include="GraphQL.SystemTextJson" Version="7.0.1" />
     <PackageReference Include="Verify.DiffPlex" Version="1.3.0" />
     <PackageReference Include="Xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ public class ComplexInputInnerGraph :`
`4`	`4`	`InputObjectGraphType<ComplexInputInner>`
`5`	`5`	`{`
`6`	`6`	`public ComplexInputInnerGraph() =>`
`7`		`- Field<StringGraphType, string?>()`
`8`		`- .Name("content")`
	`7`	`+ Field<StringGraphType, string?>("content")`
`9`	`8`	`.Resolve(ctx => ctx.Source.Content);`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,10 @@ public class ComplexInputListItemGraph :`
`5`	`5`	`{`
`6`	`6`	`public ComplexInputListItemGraph()`
`7`	`7`	`{`
`8`		`- Field<NonNullGraphType<IntGraphType>>()`
`9`		`- .Name("id")`
	`8`	`+ Field<NonNullGraphType<IntGraphType>>("id")`
`10`	`9`	`.Resolve(ctx => ctx.Source.Id);`
`11`	`10`
`12`		`- Field<StringGraphType, string?>()`
`13`		`- .Name("content")`
	`11`	`+ Field<StringGraphType, string?>("content")`
`14`	`12`	`.Resolve(ctx => ctx.Source.Content);`
`15`	`13`	`}`
`16`	`14`	`}`