Fix schema initializer not registered if multiple HostedServices added

pekkah · Jan 2, 2025 · 579ee5c · 579ee5c
1 parent 5b297b1
commit 579ee5c
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 445 deletions.
diff --git a/benchmarks/GraphQL.Benchmarks/ExecutionBenchmarks.cs b/benchmarks/GraphQL.Benchmarks/ExecutionBenchmarks.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Order;
@@ -29,30 +30,21 @@ public class ExecutionBenchmarks
     private ExecutableDocument _subscription;
     private Executor _nonValidatingExecutor;
 
-    //[Benchmark]
-    //public async Task Mutation_with_defaults()
-    //{
-    //var result = await Executor.ExecuteAsync(new ExecutionOptions
-    //    {
-    //        Document = _mutation,
-    //        Schema = _schema
-    //    });
-
-    //    AssertResult(result.Errors);
-    //}
-
-    //[Benchmark]
-    //public async Task Mutation_without_validation()
-    //{
-    //    var result = await Executor.ExecuteAsync(new ExecutionOptions
-    //        {
-    //            Document = _mutation,
-    //            Schema = _schema,
-    //            Validate = null
-    //        });
-
-    //        AssertResult(result.Errors);
-    //}
+    [Benchmark]
+    public async Task Mutation_with_defaults()
+    {
+        var result = await _executor.Execute(new GraphQLRequest(_mutation));
+
+        AssertResult(result.Errors);
+    }
+
+    [Benchmark]
+    public async Task Mutation_without_validation()
+    {
+        var result = await _nonValidatingExecutor.Execute(new GraphQLRequest(_mutation));
+
+        AssertResult(result.Errors);
+    }
 
     [Benchmark]
     public async Task Query_with_validation()
@@ -102,51 +94,31 @@ public void Setup()
         });
     }
 
-    //[Benchmark]
-    //public async Task Subscribe_with_defaults()
-    //{
-    //    var cts = new CancellationTokenSource();
-    //        var result = await Executor.SubscribeAsync(new ExecutionOptions
-    //        {
-    //            Document = _subscription,
-    //            Schema = _schema
-    //        }, cts.Token);
-
-    //        AssertResult(result.Errors);
-    //        cts.Cancel();
-    //}
-
-    //[Benchmark]
-    //public async Task Subscribe_with_defaults_and_get_value()
-    //{
-    //    var cts = new CancellationTokenSource();
-    //        var result = await Executor.SubscribeAsync(new ExecutionOptions
-    //        {
-    //            Document = _subscription,
-    //            Schema = _schema
-    //        }, cts.Token);
-
-    //        AssertResult(result.Errors);
-
-    //        var value = await result.Source.Reader.ReadAsync(cts.Token);
-    //        AssertResult(value.Errors);
-    //        cts.Cancel();
-    //}
-
-    //[Benchmark]
-    //public async Task Subscribe_without_validation()
-    //{
-    //    var cts = new CancellationTokenSource();
-    //        var result = await Executor.SubscribeAsync(new ExecutionOptions
-    //        {
-    //            Document = _subscription,
-    //            Schema = _schema,
-    //            Validate = null
-    //        }, cts.Token);
-
-    //        AssertResult(result.Errors);
-    //        cts.Cancel();
-    //}
+    [Benchmark]
+    public async Task Subscribe_with_defaults()
+    {
+        var cts = new CancellationTokenSource();
+        var result = await _executor.Subscribe(new GraphQLRequest()
+        {
+            Query = _subscription,
+        }, cts.Token).SingleAsync(cancellationToken: cts.Token);
+
+        AssertResult(result.Errors);
+        cts.Cancel();
+    }
+
+    [Benchmark]
+    public async Task Subscribe_without_validation()
+    {
+        var cts = new CancellationTokenSource();
+        var result = await _nonValidatingExecutor.Subscribe(new GraphQLRequest()
+        {
+            Query = _subscription,
+        }, cts.Token).SingleAsync(cancellationToken: cts.Token);
+
+        AssertResult(result.Errors);
+        cts.Cancel();
+    }
 
     private static void AssertResult(IEnumerable<ExecutionError> errors)
     {

diff --git a/benchmarks/GraphQL.Benchmarks/GraphQL.Benchmarks.csproj b/benchmarks/GraphQL.Benchmarks/GraphQL.Benchmarks.csproj
@@ -19,6 +19,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageReference Include="GraphQL-Parser" Version="9.5.0" />
+    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/GraphQL.Server/GraphQLApplicationBuilder.cs b/src/GraphQL.Server/GraphQLApplicationBuilder.cs
@@ -57,7 +57,7 @@ public GraphQLApplicationBuilder AddWebSockets()
 
     private void AddDefaultTankaGraphQLServerServices()
     {
-        ApplicationServices.TryAddSingleton<IHostedService, SchemaInitializer>();
+        ApplicationServices.AddHostedService<SchemaInitializer>();
         ApplicationServices.TryAddSingleton<SchemaCollection>();
         ApplicationServices.TryAddSingleton<GraphQLApplication>();
         ApplicationServices.AddDefaultTankaGraphQLServices();

diff --git a/templates/GraphQL.Template.HelloWorld/.template.config/template.json b/templates/GraphQL.Template.HelloWorld/.template.config/template.json
diff --git a/templates/GraphQL.Template.HelloWorld/GraphQL.Template.HelloWorld.csproj b/templates/GraphQL.Template.HelloWorld/GraphQL.Template.HelloWorld.csproj
diff --git a/templates/GraphQL.Template.HelloWorld/Program.cs b/templates/GraphQL.Template.HelloWorld/Program.cs
diff --git a/templates/GraphQL.Template.HelloWorld/Properties/launchSettings.json b/templates/GraphQL.Template.HelloWorld/Properties/launchSettings.json
diff --git a/templates/GraphQL.Template.HelloWorld/appsettings.Development.json b/templates/GraphQL.Template.HelloWorld/appsettings.Development.json
diff --git a/templates/GraphQL.Template.HelloWorld/appsettings.json b/templates/GraphQL.Template.HelloWorld/appsettings.json
diff --git a/templates/GraphQL.Template/.template.config/template.json b/templates/GraphQL.Template/.template.config/template.json
diff --git a/templates/GraphQL.Template/GraphQL.Template.csproj b/templates/GraphQL.Template/GraphQL.Template.csproj
diff --git a/templates/GraphQL.Template/Program.cs b/templates/GraphQL.Template/Program.cs