Update HotChocolate to 13.0.0-preview.95 (#105)

glen-84 · web-flow · commit 7ada49a296c1 · 2023-01-10T20:52:38.000+03:00
diff --git a/src/AppAny.HotChocolate.FluentValidation.csproj b/src/AppAny.HotChocolate.FluentValidation.csproj
@@ -34,7 +34,7 @@
 
   <ItemGroup Label="Packages">
     <PackageReference Include="FluentValidation" Version="11.1.1" />
-    <PackageReference Include="HotChocolate.Execution" Version="13.0.0-preview.66" />
+    <PackageReference Include="HotChocolate.Execution" Version="13.0.0-preview.95" />
   </ItemGroup>
 
   <ItemGroup Label="Assets">
diff --git a/src/Extensions/RequestExecutorBuilderExtensions.cs b/src/Extensions/RequestExecutorBuilderExtensions.cs
@@ -18,9 +18,7 @@ public static IRequestExecutorBuilder AddFluentValidation(
 
       builder.SetContextData(ValidationDefaults.ValidationOptionsKey, validationOptions);
 
-      builder.OnBeforeCompleteType(ValidationDefaults.Interceptors.OnBeforeCompleteType);
-
-      builder.OnAfterSchemaCreate(ValidationDefaults.Interceptors.OnAfterSchemaCreate);
+      builder.TryAddTypeInterceptor(ValidationDefaults.Interceptor);
 
       return builder;
     }
diff --git a/src/ValidationDefaults.cs b/src/ValidationDefaults.cs
@@ -7,7 +7,6 @@
 global using FluentValidation.Results;
 using System.Runtime.CompilerServices;
 using FluentValidation.Internal;
-using HotChocolate.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace AppAny.HotChocolate.FluentValidation
@@ -35,13 +34,9 @@ public static class ValidationDefaults
     public static FieldMiddleware Middleware { get; } = ValidationMiddlewares.Field;
 
     /// <summary>
-    ///   Default HotChocolate interceptors
+    ///   Default HotChocolate interceptor
     /// </summary>
-    public static class Interceptors
-    {
-      public static OnCompleteType OnBeforeCompleteType { get; } = ValidationInterceptors.OnBeforeCompleteType;
-      public static OnAfterSchemaCreate OnAfterSchemaCreate { get; } = ValidationInterceptors.OnAfterSchemaCreate;
-    }
+    public static Type Interceptor { get; } = typeof(ValidationInterceptor);
 
     /// <summary>
     ///   Default graphql error extensions keys
diff --git a/src/ValidationInterceptor.cs b/src/ValidationInterceptor.cs
@@ -1,17 +1,15 @@
-using System.Collections.Generic;
 using System.Linq;
 using HotChocolate.Configuration;
 using HotChocolate.Types.Descriptors;
 using HotChocolate.Types.Descriptors.Definitions;
 
 namespace AppAny.HotChocolate.FluentValidation
 {
-  internal sealed class ValidationInterceptors
+  internal sealed class ValidationInterceptor : TypeInterceptor
   {
-    public static void OnBeforeCompleteType(
+    public override void OnBeforeCompleteType(
       ITypeCompletionContext completionContext,
-      DefinitionBase? definition,
-      IDictionary<string, object?> contextData)
+      DefinitionBase? definition)
     {
       if (definition is not ObjectTypeDefinition objectTypeDefinition)
       {
@@ -43,7 +41,7 @@ public static void OnBeforeCompleteType(
       }
     }
 
-    public static void OnAfterSchemaCreate(IDescriptorContext descriptorContext, ISchema schema)
+    public override void OnAfterCreateSchema(IDescriptorContext descriptorContext, ISchema schema)
     {
       foreach (var objectField in schema.Types.OfType<IObjectType>().SelectMany(type => type.Fields))
       {
diff --git a/tests/AppAny.HotChocolate.FluentValidation.Benchmarks/EmptyInputsValidationBenchmarks.cs b/tests/AppAny.HotChocolate.FluentValidation.Benchmarks/EmptyInputsValidationBenchmarks.cs
@@ -26,10 +26,10 @@ public async Task GlobalSetup()
             .Argument("input", arg => arg.Type<TestInputType>().UseFluentValidation())))
           .Services.AddSingleton<IValidator<TestInput>, TestInputValidator>());
 
-      fairyBreadValidation = await BenchmarkSetup.CreateRequestExecutor(
-        builder => builder.AddFairyBread()
-          .AddMutationType(new TestMutationType(field => field.Argument("input", arg => arg.Type<TestInputType>())))
-          .Services.AddSingleton<TestInputValidator>().AddSingleton<IValidator<TestInput>, TestInputValidator>());
+      // fairyBreadValidation = await BenchmarkSetup.CreateRequestExecutor(
+      //   builder => builder.AddFairyBread()
+      //     .AddMutationType(new TestMutationType(field => field.Argument("input", arg => arg.Type<TestInputType>())))
+      //     .Services.AddSingleton<TestInputValidator>().AddSingleton<IValidator<TestInput>, TestInputValidator>());
     }
 
     [Benchmark]
diff --git a/tests/AppAny.HotChocolate.FluentValidation.Benchmarks/NullInputsValidationBenchmarks.cs b/tests/AppAny.HotChocolate.FluentValidation.Benchmarks/NullInputsValidationBenchmarks.cs
@@ -26,10 +26,10 @@ public async Task GlobalSetup()
             field.Argument("input", arg => arg.Type<TestInputType>().UseFluentValidation())))
           .Services.AddSingleton<IValidator<TestInput>, TestInputValidator>());
 
-      fairyBreadValidation = await BenchmarkSetup.CreateRequestExecutor(
-        builder => builder.AddFairyBread()
-          .AddMutationType(new TestMutationType(field => field.Argument("input", arg => arg.Type<TestInputType>())))
-          .Services.AddSingleton<TestInputValidator>().AddSingleton<IValidator<TestInput>, TestInputValidator>());
+      // fairyBreadValidation = await BenchmarkSetup.CreateRequestExecutor(
+      //   builder => builder.AddFairyBread()
+      //     .AddMutationType(new TestMutationType(field => field.Argument("input", arg => arg.Type<TestInputType>())))
+      //     .Services.AddSingleton<TestInputValidator>().AddSingleton<IValidator<TestInput>, TestInputValidator>());
     }
 
     [Benchmark]
diff --git a/tests/AppAny.HotChocolate.FluentValidation.Benchmarks/ScopedValidationBenchmarks.cs b/tests/AppAny.HotChocolate.FluentValidation.Benchmarks/ScopedValidationBenchmarks.cs
@@ -26,10 +26,10 @@ public async Task GlobalSetup()
             .Type<TestInputType>().UseFluentValidation(opt => opt.UseValidator<TestInputValidator>()))))
           .Services.AddScoped<TestInputValidator>());
 
-      fairyBreadValidation = await BenchmarkSetup.CreateRequestExecutor(
-        builder => builder.AddFairyBread()
-          .AddMutationType(new TestMutationType(field => field.Argument("input", arg => arg.Type<TestInputType>())))
-          .Services.AddScoped<TestInputValidator>().AddScoped<IValidator<TestInput>, TestInputValidator>());
+      // fairyBreadValidation = await BenchmarkSetup.CreateRequestExecutor(
+      //   builder => builder.AddFairyBread()
+      //     .AddMutationType(new TestMutationType(field => field.Argument("input", arg => arg.Type<TestInputType>())))
+      //     .Services.AddScoped<TestInputValidator>().AddScoped<IValidator<TestInput>, TestInputValidator>());
     }
 
     [Benchmark]
diff --git a/tests/AppAny.HotChocolate.FluentValidation.Benchmarks/SingletonValidationBenchmarks.cs b/tests/AppAny.HotChocolate.FluentValidation.Benchmarks/SingletonValidationBenchmarks.cs
@@ -26,10 +26,10 @@ public async Task GlobalSetup()
             .Type<TestInputType>().UseFluentValidation(opt => opt.UseValidator<TestInputValidator>()))))
           .Services.AddSingleton<TestInputValidator>());
 
-      fairyBreadValidation = await BenchmarkSetup.CreateRequestExecutor(
-        builder => builder.AddFairyBread()
-          .AddMutationType(new TestMutationType(field => field.Argument("input", arg => arg.Type<TestInputType>())))
-          .Services.AddSingleton<TestInputValidator>().AddSingleton<IValidator<TestInput>, TestInputValidator>());
+      // fairyBreadValidation = await BenchmarkSetup.CreateRequestExecutor(
+      //   builder => builder.AddFairyBread()
+      //     .AddMutationType(new TestMutationType(field => field.Argument("input", arg => arg.Type<TestInputType>())))
+      //     .Services.AddSingleton<TestInputValidator>().AddSingleton<IValidator<TestInput>, TestInputValidator>());
     }
 
     [Benchmark]

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,7 @@ public static IRequestExecutorBuilder AddFluentValidation(`
`18`	`18`
`19`	`19`	`builder.SetContextData(ValidationDefaults.ValidationOptionsKey, validationOptions);`
`20`	`20`
`21`		`- builder.OnBeforeCompleteType(ValidationDefaults.Interceptors.OnBeforeCompleteType);`
`22`		`-`
`23`		`- builder.OnAfterSchemaCreate(ValidationDefaults.Interceptors.OnAfterSchemaCreate);`
	`21`	`+ builder.TryAddTypeInterceptor(ValidationDefaults.Interceptor);`
`24`	`22`
`25`	`23`	`return builder;`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,15 @@`
`1`		`-using System.Collections.Generic;`
`2`	`1`	`using System.Linq;`
`3`	`2`	`using HotChocolate.Configuration;`
`4`	`3`	`using HotChocolate.Types.Descriptors;`
`5`	`4`	`using HotChocolate.Types.Descriptors.Definitions;`
`6`	`5`
`7`	`6`	`namespace AppAny.HotChocolate.FluentValidation`
`8`	`7`	`{`
`9`		`- internal sealed class ValidationInterceptors`
	`8`	`+ internal sealed class ValidationInterceptor : TypeInterceptor`
`10`	`9`	`{`
`11`		`- public static void OnBeforeCompleteType(`
	`10`	`+ public override void OnBeforeCompleteType(`
`12`	`11`	`ITypeCompletionContext completionContext,`
`13`		`- DefinitionBase? definition,`
`14`		`- IDictionary<string, object?> contextData)`
	`12`	`+ DefinitionBase? definition)`
`15`	`13`	`{`
`16`	`14`	`if (definition is not ObjectTypeDefinition objectTypeDefinition)`
`17`	`15`	`{`
`@@ -43,7 +41,7 @@ public static void OnBeforeCompleteType(`
`43`	`41`	`}`
`44`	`42`	`}`
`45`	`43`
`46`		`- public static void OnAfterSchemaCreate(IDescriptorContext descriptorContext, ISchema schema)`
	`44`	`+ public override void OnAfterCreateSchema(IDescriptorContext descriptorContext, ISchema schema)`
`47`	`45`	`{`
`48`	`46`	`foreach (var objectField in schema.Types.OfType<IObjectType>().SelectMany(type => type.Fields))`
`49`	`47`	`{`