From a36600d9885d3258be2128342ad30fae691a9480 Mon Sep 17 00:00:00 2001 From: Michael Staib Date: Wed, 16 Jan 2019 14:22:09 +0100 Subject: [PATCH] Fixed typo (#493) --- README.md | 6 +- .../Execution/QueryExecuterBenchmarkBase.cs | 40 ++-- .../Execution/QueryExecuterBenchmarks.cs | 6 +- .../QueryExecuterWithCacheBenchmarks.cs | 6 +- src/Core/Benchmark.Tests/Program.cs | 4 +- .../Execution/Errors/ErrorBehaviourTests.cs | 12 +- .../Execution/Errors/ErrorHandlerTests.cs | 16 +- .../Execution/IntrospectionTests.cs | 20 +- .../Execution/Middleware/ContextDataTests.cs | 4 +- .../QueryExecuterExtensionsTests.cs | 12 +- .../Middleware/QueryExecuterTests.cs | 46 ++--- .../Execution/ScalarExecutionErrorTests.cs | 16 +- .../Integration/DataLoader/DataLoaderTests.cs | 44 ++--- .../StarWarsCodeFirstTests.cs | 102 +++++----- src/Core/Core/Execution/IQueryExecuter.cs | 2 +- .../Core/Execution/IQueryExecutionBuilder.cs | 2 +- .../Core/Execution/IRequestServiceScope.cs | 2 +- .../QueryExecutionBuilderExtensions.cs | 4 +- src/Core/Core/Execution/QueryExecuter.cs | 6 +- .../Core/Execution/QueryExecuterExtensions.cs | 34 ++-- .../Core/Execution/QueryExecutionBuilder.cs | 8 +- src/Core/Core/ExecutionSchemaExtensions.cs | 6 +- src/Core/Core/LegacySchemaExtensions.cs | 4 +- .../Stitching.Tests/HttpQueryExecuterTests.cs | 6 +- src/Core/Stitching.Tests/QueryBrokerTests.cs | 10 +- src/Core/Stitching/HttpQueryExecuter.cs | 6 +- src/Core/Stitching/IStitchingContext.cs | 2 +- src/Core/Stitching/QueryBroker.cs | 6 +- src/Core/Stitching/StitchingContext.cs | 16 +- .../Subscriptions.Tests/SubscriptionTests.cs | 6 +- .../MiddlewareConfigurationTests.cs | 12 +- .../Descriptors/ObjectTypeDescriptorTests.cs | 4 +- src/Core/Types.Tests/Types/ObjectTypeTests.cs | 4 +- .../Types/Relay/ConnectionTypeTests.cs | 4 +- .../Types/Relay/IdMiddlewareTests.cs | 4 +- .../Authorization/AuthorizationTests.cs | 182 +++++++++--------- .../Subscriptions/InMemoryWebSocketContext.cs | 2 +- .../ApplicationBuilderExtensions.cs | 12 +- src/Server/AspNetCore/GetQueryMiddleware.cs | 4 +- src/Server/AspNetCore/PostQueryMiddleware.cs | 4 +- src/Server/AspNetCore/QueryMiddlewareBase.cs | 24 +-- src/Server/AspNetCore/SchemaMiddleware.cs | 10 +- .../AspNetCore/ServiceCollectionExtensions.cs | 24 +-- .../AspNetCore/SubscriptionMiddleware.cs | 10 +- .../Subscriptions/IWebSocketContext.cs | 2 +- .../Subscriptions/SubscriptionStartHandler.cs | 2 +- .../Subscriptions/WebSocketContext.cs | 8 +- .../Subscriptions/WebSocketSession.cs | 8 +- 48 files changed, 387 insertions(+), 387 deletions(-) diff --git a/README.md b/README.md index bb4795457f5..b5fe436476e 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ Moreover, we bound a resolver to the field that returns a fixed value _world_. A In order to serve up queries against our schema lets make it executable: ```csharp -var executer = schema.MakeExecutable(); +var executor = schema.MakeExecutable(); ``` Now that the schema is setup and executable we can serve up a query against it. @@ -100,7 +100,7 @@ Now that the schema is setup and executable we can serve up a query against it. // { // data: { hello: "world" } // } -Console.WriteLine(executer.Execute("{ hello }")); +Console.WriteLine(executor.Execute("{ hello }")); ``` This runs a query fetching the one field defined. The graphql function will first ensure the query is syntactically and semantically valid before executing it, reporting errors otherwise. @@ -120,7 +120,7 @@ This runs a query fetching the one field defined. The graphql function will firs // } // ] // } -Console.WriteLine(executer.Execute("{ foo }")); +Console.WriteLine(executor.Execute("{ foo }")); ``` In order to set up a GraphQL HTTP endpoint, Hot Chocolate comes with an ASP.net core middleware. diff --git a/src/Core/Benchmark.Tests/Execution/QueryExecuterBenchmarkBase.cs b/src/Core/Benchmark.Tests/Execution/QueryExecuterBenchmarkBase.cs index 1af23be3c30..d4654f79075 100644 --- a/src/Core/Benchmark.Tests/Execution/QueryExecuterBenchmarkBase.cs +++ b/src/Core/Benchmark.Tests/Execution/QueryExecuterBenchmarkBase.cs @@ -10,15 +10,15 @@ namespace HotChocolate.Benchmark.Tests.Execution [CoreJob] [RPlotExporter, MemoryDiagnoser] - public class QueryExecuterBenchmarkBase + public class QueryExecutorBenchmarkBase { private readonly Schema _schema; - private readonly IQueryExecuter _queryExecuter; + private readonly IQueryExecutor _queryExecutor; - public QueryExecuterBenchmarkBase(int cacheSize) + public QueryExecutorBenchmarkBase(int cacheSize) { _schema = SchemaFactory.Create(); - _queryExecuter = QueryExecutionBuilder.New() + _queryExecutor = QueryExecutionBuilder.New() .UseDefaultPipeline() .AddQueryCache(cacheSize) .Build(_schema); @@ -38,7 +38,7 @@ public async Task GraphQLOrgFieldExample() } }"; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query), CancellationToken.None); } @@ -54,7 +54,7 @@ public async Task GraphQLOrgFieldArgumentExample1() } }"; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query), CancellationToken.None); } @@ -70,7 +70,7 @@ public async Task GraphQLOrgFieldArgumentExample2() } }"; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query), CancellationToken.None); } @@ -88,7 +88,7 @@ public async Task GraphQLOrgAliasExample() } }"; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query), CancellationToken.None); } @@ -114,7 +114,7 @@ fragment comparisonFields on Character { } }"; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query), CancellationToken.None); } @@ -132,7 +132,7 @@ query HeroNameAndFriends { } }"; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query), CancellationToken.None); } @@ -156,7 +156,7 @@ query HeroNameAndFriends($episode: Episode) { { "episode", new EnumValueNode("JEDI") } }; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query) { VariableValues = variables }, CancellationToken.None); } @@ -174,7 +174,7 @@ query HeroNameAndFriends($episode: Episode = JEDI) { } }"; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query), CancellationToken.None); } @@ -198,7 +198,7 @@ friends @include(if: $withFriends) { { "withFriends", new BooleanValueNode(false) } }; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query) { VariableValues = variables }, CancellationToken.None); } @@ -222,7 +222,7 @@ friends @include(if: $withFriends) { { "withFriends", new BooleanValueNode(true) } }; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query) { VariableValues = variables }, CancellationToken.None); } @@ -246,7 +246,7 @@ friends @skip(if: $withFriends) { { "withFriends", new BooleanValueNode(false) } }; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query) { VariableValues = variables }, CancellationToken.None); } @@ -270,7 +270,7 @@ friends @skip(if: $withFriends) { { "withFriends", new BooleanValueNode(true) } }; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query) { VariableValues = variables }, CancellationToken.None); } @@ -295,7 +295,7 @@ mutation CreateReviewForEpisode($ep: Episode!, $review: ReviewInput!) { new StringValueNode("This is a great movie!"))) } }; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query) { VariableValues = variables }, CancellationToken.None); } @@ -321,7 +321,7 @@ ... on Human { { "ep", new EnumValueNode("JEDI") }, }; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query) { VariableValues = variables }, CancellationToken.None); } @@ -347,7 +347,7 @@ ... on Human { { "ep", new EnumValueNode("EMPIRE") }, }; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query) { VariableValues = variables }, CancellationToken.None); } @@ -374,7 +374,7 @@ ... on Starship { } }"; - return await _queryExecuter.ExecuteAsync( + return await _queryExecutor.ExecuteAsync( new QueryRequest(query), CancellationToken.None); } diff --git a/src/Core/Benchmark.Tests/Execution/QueryExecuterBenchmarks.cs b/src/Core/Benchmark.Tests/Execution/QueryExecuterBenchmarks.cs index e0400482182..a882434ded6 100644 --- a/src/Core/Benchmark.Tests/Execution/QueryExecuterBenchmarks.cs +++ b/src/Core/Benchmark.Tests/Execution/QueryExecuterBenchmarks.cs @@ -1,9 +1,9 @@ namespace HotChocolate.Benchmark.Tests.Execution { - public class QueryExecuterBenchmarks - : QueryExecuterBenchmarkBase + public class QueryExecutorBenchmarks + : QueryExecutorBenchmarkBase { - public QueryExecuterBenchmarks() + public QueryExecutorBenchmarks() : base(0) { } diff --git a/src/Core/Benchmark.Tests/Execution/QueryExecuterWithCacheBenchmarks.cs b/src/Core/Benchmark.Tests/Execution/QueryExecuterWithCacheBenchmarks.cs index 98525acc9cd..fb07c79c4f8 100644 --- a/src/Core/Benchmark.Tests/Execution/QueryExecuterWithCacheBenchmarks.cs +++ b/src/Core/Benchmark.Tests/Execution/QueryExecuterWithCacheBenchmarks.cs @@ -1,9 +1,9 @@ namespace HotChocolate.Benchmark.Tests.Execution { - public class QueryExecuterWithCacheBenchmarks - : QueryExecuterBenchmarkBase + public class QueryExecutorWithCacheBenchmarks + : QueryExecutorBenchmarkBase { - public QueryExecuterWithCacheBenchmarks() + public QueryExecutorWithCacheBenchmarks() : base(100) { } diff --git a/src/Core/Benchmark.Tests/Program.cs b/src/Core/Benchmark.Tests/Program.cs index 3d532b5cd4a..76249bfd2eb 100644 --- a/src/Core/Benchmark.Tests/Program.cs +++ b/src/Core/Benchmark.Tests/Program.cs @@ -11,8 +11,8 @@ static void Main(string[] args) { BenchmarkRunner.Run(); BenchmarkRunner.Run(); - BenchmarkRunner.Run(); - BenchmarkRunner.Run(); + BenchmarkRunner.Run(); + BenchmarkRunner.Run(); BenchmarkRunner.Run(); } } diff --git a/src/Core/Core.Tests/Execution/Errors/ErrorBehaviourTests.cs b/src/Core/Core.Tests/Execution/Errors/ErrorBehaviourTests.cs index 12e3312718c..2b1432da532 100644 --- a/src/Core/Core.Tests/Execution/Errors/ErrorBehaviourTests.cs +++ b/src/Core/Core.Tests/Execution/Errors/ErrorBehaviourTests.cs @@ -240,10 +240,10 @@ public async Task RootTypeNotDefined() var schema = Schema.Create( "type Query { foo: String }", c => c.Use(next => context => Task.CompletedTask)); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync(query); + IExecutionResult result = await executor.ExecuteAsync(query); // assert result.Snapshot(); @@ -258,10 +258,10 @@ public async Task RootFieldNotDefined() var schema = Schema.Create( "type Mutation { bar: String }", c => c.Use(next => context => Task.CompletedTask)); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync(query); + IExecutionResult result = await executor.ExecuteAsync(query); // assert result.Snapshot(); @@ -271,14 +271,14 @@ private async Task ExecuteQuery( string query, Action errorHandled) { - IQueryExecuter queryExecuter = CreateSchema().MakeExecutable( + IQueryExecutor queryExecutor = CreateSchema().MakeExecutable( b => b.UseDefaultPipeline().AddErrorFilter((error, ex) => { errorHandled(); return error; })); - return await queryExecuter.ExecuteAsync(query); + return await queryExecutor.ExecuteAsync(query); } private ISchema CreateSchema() diff --git a/src/Core/Core.Tests/Execution/Errors/ErrorHandlerTests.cs b/src/Core/Core.Tests/Execution/Errors/ErrorHandlerTests.cs index 74b048b667b..f3579305f04 100644 --- a/src/Core/Core.Tests/Execution/Errors/ErrorHandlerTests.cs +++ b/src/Core/Core.Tests/Execution/Errors/ErrorHandlerTests.cs @@ -24,13 +24,13 @@ public async Task AddFuncErrorFilter() IncludeExceptionDetails = false }; - IQueryExecuter executer = schema.MakeExecutable(builder => + IQueryExecutor executor = schema.MakeExecutable(builder => builder.UseDefaultPipeline(options) .AddErrorFilter((error, exception) => error.WithCode("Foo123"))); // act - IExecutionResult result = await executer.ExecuteAsync("{ foo }"); + IExecutionResult result = await executor.ExecuteAsync("{ foo }"); // assert result.Snapshot(); @@ -65,7 +65,7 @@ public async Task FilterOnlyNullRefExceptions() ExecutionTimeout = TimeSpan.FromMinutes(10) }; - IQueryExecuter executer = schema.MakeExecutable(builder => + IQueryExecutor executor = schema.MakeExecutable(builder => builder.UseDefaultPipeline(options) .AddErrorFilter((error, exception) => { @@ -78,7 +78,7 @@ public async Task FilterOnlyNullRefExceptions() // act IExecutionResult result = - await executer.ExecuteAsync("{ foo bar }"); + await executor.ExecuteAsync("{ foo bar }"); // assert result.Snapshot(); @@ -100,12 +100,12 @@ public async Task AddClassErrorFilter() IncludeExceptionDetails = false }; - IQueryExecuter executer = schema.MakeExecutable(builder => + IQueryExecutor executor = schema.MakeExecutable(builder => builder.UseDefaultPipeline(options) .AddErrorFilter()); // act - IExecutionResult result = await executer.ExecuteAsync("{ foo }"); + IExecutionResult result = await executor.ExecuteAsync("{ foo }"); // assert result.Snapshot(); @@ -127,12 +127,12 @@ public async Task AddClassErrorFilterWithFactory() IncludeExceptionDetails = false }; - IQueryExecuter executer = schema.MakeExecutable(builder => + IQueryExecutor executor = schema.MakeExecutable(builder => builder.UseDefaultPipeline(options) .AddErrorFilter(s => new DummyErrorFilter())); // act - IExecutionResult result = await executer.ExecuteAsync("{ foo }"); + IExecutionResult result = await executor.ExecuteAsync("{ foo }"); // assert result.Snapshot(); diff --git a/src/Core/Core.Tests/Execution/IntrospectionTests.cs b/src/Core/Core.Tests/Execution/IntrospectionTests.cs index 39b8c2bc542..d8372e4577a 100644 --- a/src/Core/Core.Tests/Execution/IntrospectionTests.cs +++ b/src/Core/Core.Tests/Execution/IntrospectionTests.cs @@ -12,10 +12,10 @@ public async Task TypeNameIntrospectionOnQuery() { // arrange string query = "{ __typename }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync(query); + IExecutionResult result = await executor.ExecuteAsync(query); // assert Assert.Empty(result.Errors); @@ -27,10 +27,10 @@ public async Task TypeNameIntrospectionNotOnQuery() { // arrange string query = "{ b { __typename } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync(query); + IExecutionResult result = await executor.ExecuteAsync(query); // assert Assert.Empty(result.Errors); @@ -42,10 +42,10 @@ public async Task TypeIntrospectionOnQuery() { // arrange string query = "{ __type (type: \"Foo\") { name } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync(query); + IExecutionResult result = await executor.ExecuteAsync(query); // assert Assert.Empty(result.Errors); @@ -59,10 +59,10 @@ public async Task TypeIntrospectionOnQueryWithFields() string query = "{ __type (type: \"Foo\") " + "{ name fields { name type { name } } } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync(query); + IExecutionResult result = await executor.ExecuteAsync(query); // assert Assert.Empty(result.Errors); @@ -75,10 +75,10 @@ public async Task ExecuteGraphiQLIntrospectionQuery() // arrange string query = FileResource.Open("IntrospectionQuery.graphql"); - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync(query); + IExecutionResult result = await executor.ExecuteAsync(query); // assert Assert.Empty(result.Errors); diff --git a/src/Core/Core.Tests/Execution/Middleware/ContextDataTests.cs b/src/Core/Core.Tests/Execution/Middleware/ContextDataTests.cs index 8002f67e47a..7d43f7f53d4 100644 --- a/src/Core/Core.Tests/Execution/Middleware/ContextDataTests.cs +++ b/src/Core/Core.Tests/Execution/Middleware/ContextDataTests.cs @@ -22,7 +22,7 @@ public async Task ContextDataIsPassedAllongCorrectly() return Task.CompletedTask; })); - IQueryExecuter executer = schema.MakeExecutable( + IQueryExecutor executor = schema.MakeExecutable( b => b.UseDefaultPipeline() .Use(next => context => { @@ -35,7 +35,7 @@ public async Task ContextDataIsPassedAllongCorrectly() })); // act - IExecutionResult result = await executer.ExecuteAsync( + IExecutionResult result = await executor.ExecuteAsync( new QueryRequest("{ foo }") { Properties = new Dictionary diff --git a/src/Core/Core.Tests/Execution/Middleware/QueryExecuterExtensionsTests.cs b/src/Core/Core.Tests/Execution/Middleware/QueryExecuterExtensionsTests.cs index fb17c938d6e..23f1a69bb46 100644 --- a/src/Core/Core.Tests/Execution/Middleware/QueryExecuterExtensionsTests.cs +++ b/src/Core/Core.Tests/Execution/Middleware/QueryExecuterExtensionsTests.cs @@ -18,7 +18,7 @@ public async Task UseDelegateMiddleware() .To("Query", "a"); }); - var executer = QueryExecutionBuilder + var executor = QueryExecutionBuilder .New() .Use(next => context => { @@ -32,7 +32,7 @@ public async Task UseDelegateMiddleware() .Build(schema); // act - IExecutionResult result = await executer.ExecuteAsync("{ a }"); + IExecutionResult result = await executor.ExecuteAsync("{ a }"); // assert result.Snapshot(); @@ -50,13 +50,13 @@ public async Task UseClassMiddleware() .To("Query", "a"); }); - var executer = QueryExecutionBuilder + var executor = QueryExecutionBuilder .New() .Use() .Build(schema); // act - IExecutionResult result = await executer.ExecuteAsync("{ a }"); + IExecutionResult result = await executor.ExecuteAsync("{ a }"); // assert result.Snapshot(); @@ -74,13 +74,13 @@ public async Task UseClassMiddlewareWithFactory() .To("Query", "a"); }); - var executer = QueryExecutionBuilder + var executor = QueryExecutionBuilder .New() .Use((services, next) => new TestMiddleware(next)) .Build(schema); // act - IExecutionResult result = await executer.ExecuteAsync("{ a }"); + IExecutionResult result = await executor.ExecuteAsync("{ a }"); // assert result.Snapshot(); diff --git a/src/Core/Core.Tests/Execution/Middleware/QueryExecuterTests.cs b/src/Core/Core.Tests/Execution/Middleware/QueryExecuterTests.cs index d9721184241..d775b713ab0 100644 --- a/src/Core/Core.Tests/Execution/Middleware/QueryExecuterTests.cs +++ b/src/Core/Core.Tests/Execution/Middleware/QueryExecuterTests.cs @@ -8,7 +8,7 @@ namespace HotChocolate.Execution { - public class QueryExecuterTests + public class QueryExecutorTests { [Fact] public void SchemaIsNull_ShouldThrow() @@ -25,12 +25,12 @@ public async Task ExecuteShortHandQuery() { // arrange Schema schema = CreateSchema(); - IQueryExecuter executer = QueryExecutionBuilder + IQueryExecutor executor = QueryExecutionBuilder .BuildDefault(schema); var request = new QueryRequest("{ a }"); // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.Empty(result.Errors); @@ -42,7 +42,7 @@ public async Task ExecuteShortHandQueryWithTracing() { // arrange Schema schema = CreateSchema(); - IQueryExecuter executer = QueryExecutionBuilder + IQueryExecutor executor = QueryExecutionBuilder .BuildDefault(schema, new QueryExecutionOptions { EnableTracing = true @@ -50,7 +50,7 @@ public async Task ExecuteShortHandQueryWithTracing() var request = new QueryRequest("{ a }"); // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.NotEmpty(result.Extensions); @@ -64,7 +64,7 @@ public async Task ExecuteWithMissingVariables_Error() var variableValues = new Dictionary(); Schema schema = CreateSchema(); - IQueryExecuter executer = QueryExecutionBuilder + IQueryExecutor executor = QueryExecutionBuilder .BuildDefault(schema); var request = new QueryRequest( "query x($a: String!) { b(a: $a) }") @@ -73,7 +73,7 @@ public async Task ExecuteWithMissingVariables_Error() }; // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.NotNull(result.Errors); @@ -91,7 +91,7 @@ public async Task ExecuteWithNonNullVariableNull_Error() }; Schema schema = CreateSchema(); - var executer = QueryExecutionBuilder.BuildDefault(schema); + var executor = QueryExecutionBuilder.BuildDefault(schema); var request = new QueryRequest( "query x($a: String!) { b(a: $a) }") { @@ -99,7 +99,7 @@ public async Task ExecuteWithNonNullVariableNull_Error() }; // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.NotNull(result.Errors); @@ -116,7 +116,7 @@ public async Task ExecuteWithNonNullVariableInvalidType_Error() }; Schema schema = CreateSchema(); - var executer = QueryExecutionBuilder.BuildDefault(schema); + var executor = QueryExecutionBuilder.BuildDefault(schema); var request = new QueryRequest( "query x($a: String!) { b(a: $a) }") { @@ -124,7 +124,7 @@ public async Task ExecuteWithNonNullVariableInvalidType_Error() }; // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.NotNull(result.Errors); @@ -142,7 +142,7 @@ public async Task ExecuteWithNonNullVariableValidValue_NoErrors() }; Schema schema = CreateSchema(); - var executer = QueryExecutionBuilder.BuildDefault(schema); + var executor = QueryExecutionBuilder.BuildDefault(schema); var request = new QueryRequest( "query x($a: String!) { b(a: $a) }") { @@ -150,7 +150,7 @@ public async Task ExecuteWithNonNullVariableValidValue_NoErrors() }; // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.Empty(result.Errors); @@ -162,12 +162,12 @@ public async Task ExecuteQueryWith2OperationsAndNoOperationName_Error() { // arrange Schema schema = CreateSchema(); - var executer = QueryExecutionBuilder.BuildDefault(schema); + var executor = QueryExecutionBuilder.BuildDefault(schema); var request = new QueryRequest( "query a { a } query b { a }"); // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.NotNull(result.Errors); @@ -179,12 +179,12 @@ public async Task ExecuteQueryWith2OperationsAndOperationName_NoErrors() { // arrange Schema schema = CreateSchema(); - var executer = QueryExecutionBuilder.BuildDefault(schema); + var executor = QueryExecutionBuilder.BuildDefault(schema); var request = new QueryRequest( "query a { a } query b { a }", "a"); // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.Empty(result.Errors); @@ -196,12 +196,12 @@ public async Task ExecuteQueryWith2OperationsAndInvalidOpName_Error() { // arrange Schema schema = CreateSchema(); - var executer = QueryExecutionBuilder.BuildDefault(schema); + var executor = QueryExecutionBuilder.BuildDefault(schema); var request = new QueryRequest( "query a { a } query b { a }", "c"); // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.NotNull(result.Errors); @@ -216,11 +216,11 @@ public async Task ExecuteFieldWithResolverResult() new Dictionary(); Schema schema = CreateSchema(); - var executer = QueryExecutionBuilder.BuildDefault(schema); + var executor = QueryExecutionBuilder.BuildDefault(schema); var request = new QueryRequest("{ x xasync }"); // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.Empty(result.Errors); @@ -235,11 +235,11 @@ public async Task ExecuteFieldWithResolverResultError() new Dictionary(); Schema schema = CreateSchema(); - var executer = QueryExecutionBuilder.BuildDefault(schema); + var executor = QueryExecutionBuilder.BuildDefault(schema); var request = new QueryRequest("{ y yasync }"); // act - IExecutionResult result = await executer.ExecuteAsync(request); + IExecutionResult result = await executor.ExecuteAsync(request); // assert Assert.NotNull(result.Errors); diff --git a/src/Core/Core.Tests/Execution/ScalarExecutionErrorTests.cs b/src/Core/Core.Tests/Execution/ScalarExecutionErrorTests.cs index 01d9a51474d..adbcb319f0a 100644 --- a/src/Core/Core.Tests/Execution/ScalarExecutionErrorTests.cs +++ b/src/Core/Core.Tests/Execution/ScalarExecutionErrorTests.cs @@ -20,10 +20,10 @@ public async Task OutputType_ClrValue_CannotBeConverted() t.RegisterQueryType(); }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync( + IExecutionResult result = await executor.ExecuteAsync( "{ stringToName(name: \" \") }"); // assert @@ -39,10 +39,10 @@ public async Task OutputType_ClrValue_CannotBeParsed() t.RegisterQueryType(); }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync( + IExecutionResult result = await executor.ExecuteAsync( "{ stringToFoo(name: \" \") }"); // assert @@ -58,10 +58,10 @@ public async Task InputType_Literal_CannotBeParsed() t.RegisterQueryType(); }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync( + IExecutionResult result = await executor.ExecuteAsync( "{ nameToString(name: \" \") }"); // assert @@ -77,10 +77,10 @@ public async Task InputType_Variable_CannotBeDeserialized() t.RegisterQueryType(); }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync( + IExecutionResult result = await executor.ExecuteAsync( "query a($a: Foo) { fooToString(name: $a) }", new Dictionary { diff --git a/src/Core/Core.Tests/Integration/DataLoader/DataLoaderTests.cs b/src/Core/Core.Tests/Integration/DataLoader/DataLoaderTests.cs index fef8b7579a6..321394bfbf5 100644 --- a/src/Core/Core.Tests/Integration/DataLoader/DataLoaderTests.cs +++ b/src/Core/Core.Tests/Integration/DataLoader/DataLoaderTests.cs @@ -35,11 +35,11 @@ public async Task FetchOnceDataLoader() }).To("Query", "fetchItem"); }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); IServiceScope scope = serviceProvider.CreateScope(); // act - IExecutionResult result = await executer.ExecuteAsync( + IExecutionResult result = await executor.ExecuteAsync( new QueryRequest("{ fetchItem }") { Services = scope.ServiceProvider @@ -71,11 +71,11 @@ public async Task FetchSingleDataLoader() }).To("Query", "fetchItem"); }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); IServiceScope scope = serviceProvider.CreateScope(); // act - IExecutionResult result = await executer.ExecuteAsync( + IExecutionResult result = await executor.ExecuteAsync( new QueryRequest("{ fetchItem }") { Services = scope.ServiceProvider @@ -109,11 +109,11 @@ public async Task FetchDataLoader() }).To("Query", "fetchItem"); }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); IServiceScope scope = serviceProvider.CreateScope(); // act - IExecutionResult result = await executer.ExecuteAsync( + IExecutionResult result = await executor.ExecuteAsync( new QueryRequest("{ fetchItem }") { Services = scope.ServiceProvider @@ -146,11 +146,11 @@ public async Task FetchGroupDataLoader() }).To("Query", "fetchItem"); }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); IServiceScope scope = serviceProvider.CreateScope(); // act - IExecutionResult result = await executer.ExecuteAsync( + IExecutionResult result = await executor.ExecuteAsync( new QueryRequest("{ fetchItem }") { Services = scope.ServiceProvider @@ -174,13 +174,13 @@ public async Task ClassDataLoader() c.Options.DeveloperMode = true; }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); IServiceScope scope = serviceProvider.CreateScope(); // act var results = new List(); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( @"{ a: withDataLoader(key: ""a"") b: withDataLoader(key: ""b"") @@ -189,7 +189,7 @@ public async Task ClassDataLoader() Services = scope.ServiceProvider })); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( @"{ a: withDataLoader(key: ""a"") }") @@ -197,7 +197,7 @@ public async Task ClassDataLoader() Services = scope.ServiceProvider })); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( @"{ c: withDataLoader(key: ""c"") }") @@ -205,7 +205,7 @@ public async Task ClassDataLoader() Services = scope.ServiceProvider })); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( "{ loads }") { Services = scope.ServiceProvider @@ -234,13 +234,13 @@ public async Task ClassDataLoaderWithKey() c.Options.DeveloperMode = true; }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); IServiceScope scope = serviceProvider.CreateScope(); // act var results = new List(); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( @"{ a: withDataLoader2(key: ""a"") b: withDataLoader2(key: ""b"") @@ -249,7 +249,7 @@ public async Task ClassDataLoaderWithKey() Services = scope.ServiceProvider })); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( @"{ a: withDataLoader2(key: ""a"") }") @@ -257,7 +257,7 @@ public async Task ClassDataLoaderWithKey() Services = scope.ServiceProvider })); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( @"{ c: withDataLoader2(key: ""c"") }") @@ -265,7 +265,7 @@ public async Task ClassDataLoaderWithKey() Services = scope.ServiceProvider })); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( "{ loads loads2 }") { Services = scope.ServiceProvider @@ -294,13 +294,13 @@ public async Task StackedDataLoader() c.Options.DeveloperMode = true; }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); IServiceScope scope = serviceProvider.CreateScope(); // act var results = new List(); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( @"{ a: withStackedDataLoader(key: ""a"") b: withStackedDataLoader(key: ""b"") @@ -309,7 +309,7 @@ public async Task StackedDataLoader() Services = scope.ServiceProvider })); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( @"{ a: withStackedDataLoader(key: ""a"") }") @@ -317,7 +317,7 @@ public async Task StackedDataLoader() Services = scope.ServiceProvider })); - results.Add(await executer.ExecuteAsync(new QueryRequest( + results.Add(await executor.ExecuteAsync(new QueryRequest( @"{ c: withStackedDataLoader(key: ""c"") }") diff --git a/src/Core/Core.Tests/Integration/StarWarsCodeFirst/StarWarsCodeFirstTests.cs b/src/Core/Core.Tests/Integration/StarWarsCodeFirst/StarWarsCodeFirstTests.cs index 832c1c6cd41..8eb2d7c032e 100644 --- a/src/Core/Core.Tests/Integration/StarWarsCodeFirst/StarWarsCodeFirstTests.cs +++ b/src/Core/Core.Tests/Integration/StarWarsCodeFirst/StarWarsCodeFirstTests.cs @@ -31,10 +31,10 @@ public void GraphQLOrgFieldExample() } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -52,10 +52,10 @@ public void GraphQLOrgFieldArgumentExample1() } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -73,10 +73,10 @@ public void GraphQLOrgFieldArgumentExample2() } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -96,10 +96,10 @@ public void GraphQLOrgAliasExample() } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -127,10 +127,10 @@ fragment comparisonFields on Character { } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -150,10 +150,10 @@ query HeroNameAndFriends { } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -178,10 +178,10 @@ query HeroNameAndFriends($episode: Episode) { { "episode", new EnumValueNode("JEDI") } }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -201,10 +201,10 @@ query HeroNameAndFriends($episode: Episode = JEDI) { } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -230,10 +230,10 @@ friends @include(if: $withFriends) { { "withFriends", new BooleanValueNode(false) } }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -259,10 +259,10 @@ friends @include(if: $withFriends) { { "withFriends", new BooleanValueNode(true) } }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -288,10 +288,10 @@ friends @skip(if: $withFriends) { { "withFriends", new BooleanValueNode(false) } }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -317,10 +317,10 @@ friends @skip(if: $withFriends) { { "withFriends", false } }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -346,10 +346,10 @@ friends @skip(if: $withFriends) { { "withFriends", new BooleanValueNode(true) } }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -376,10 +376,10 @@ mutation CreateReviewForEpisode($ep: Episode!, $review: ReviewInput!) { new StringValueNode("This is a great movie!"))) } }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -407,10 +407,10 @@ ... on Human { { "ep", new EnumValueNode("JEDI") }, }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -438,10 +438,10 @@ ... on Human { { "ep", new EnumValueNode("EMPIRE") }, }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -470,10 +470,10 @@ ... on Starship { } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -496,10 +496,10 @@ query op($ep: [Episode!]!) {"ep", new ListValueNode(new[] {new EnumValueNode("EMPIRE")})} }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -519,10 +519,10 @@ ... @include(if: true) { } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -544,10 +544,10 @@ query getHero($episode: Episode!) { ["episode"] = "NEWHOPE" }; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query, variables); + IExecutionResult result = executor.Execute(query, variables); // assert result.Snapshot(); @@ -564,10 +564,10 @@ public void EnumValueIsCoercedToListValue() } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -605,10 +605,10 @@ ... on Droid { } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -629,10 +629,10 @@ public void Execute_ListWithNullValues_ResultContainsNullElement() } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); @@ -642,16 +642,16 @@ public void Execute_ListWithNullValues_ResultContainsNullElement() public async Task SubscribeToReview() { // arrange - IQueryExecuter executer = CreateSchema().MakeExecutable(); + IQueryExecutor executor = CreateSchema().MakeExecutable(); // act var responseStream = - (IResponseStream)await executer.ExecuteAsync( + (IResponseStream)await executor.ExecuteAsync( "subscription { onCreateReview(episode: NEWHOPE) " + "{ stars } }"); // assert - IExecutionResult result = await executer.ExecuteAsync(@" + IExecutionResult result = await executor.ExecuteAsync(@" mutation { createReview(episode: NEWHOPE, review: { stars: 5 commentary: ""foo"" }) { @@ -707,11 +707,11 @@ ... on Droid { } }"; - IQueryExecuter executer = CreateSchema().MakeExecutable( + IQueryExecutor executor = CreateSchema().MakeExecutable( new QueryExecutionOptions { MaxExecutionDepth = 3 }); // act - IExecutionResult result = executer.Execute(query); + IExecutionResult result = executor.Execute(query); // assert result.Snapshot(); diff --git a/src/Core/Core/Execution/IQueryExecuter.cs b/src/Core/Core/Execution/IQueryExecuter.cs index c7cd2baff8b..d241621a44c 100644 --- a/src/Core/Core/Execution/IQueryExecuter.cs +++ b/src/Core/Core/Execution/IQueryExecuter.cs @@ -4,7 +4,7 @@ namespace HotChocolate.Execution { - public interface IQueryExecuter + public interface IQueryExecutor : IDisposable { ISchema Schema { get; } diff --git a/src/Core/Core/Execution/IQueryExecutionBuilder.cs b/src/Core/Core/Execution/IQueryExecutionBuilder.cs index 1637e02676b..c64828db6d5 100644 --- a/src/Core/Core/Execution/IQueryExecutionBuilder.cs +++ b/src/Core/Core/Execution/IQueryExecutionBuilder.cs @@ -16,6 +16,6 @@ public interface IQueryExecutionBuilder IQueryExecutionBuilder UseField(FieldMiddleware middleware); - IQueryExecuter Build(ISchema schema); + IQueryExecutor Build(ISchema schema); } } diff --git a/src/Core/Core/Execution/IRequestServiceScope.cs b/src/Core/Core/Execution/IRequestServiceScope.cs index 08a6a9e7cb5..e47da7cfe35 100644 --- a/src/Core/Core/Execution/IRequestServiceScope.cs +++ b/src/Core/Core/Execution/IRequestServiceScope.cs @@ -8,7 +8,7 @@ public interface IRequestServiceScope /// /// true, if the execution request is handling the /// lifetime of this scope; otherwise, false if the - /// scope shall be handled by the executer. + /// scope shall be handled by the executor. /// bool IsLifetimeHandled { get; } diff --git a/src/Core/Core/Execution/Middleware/QueryExecutionBuilderExtensions.cs b/src/Core/Core/Execution/Middleware/QueryExecutionBuilderExtensions.cs index db55a9fc7f0..5662f33dd50 100644 --- a/src/Core/Core/Execution/Middleware/QueryExecutionBuilderExtensions.cs +++ b/src/Core/Core/Execution/Middleware/QueryExecutionBuilderExtensions.cs @@ -44,7 +44,7 @@ public static IQueryExecutionBuilder UseDefaultPipeline( .UseOperationResolver() .UseCoerceVariables() .UseMaxComplexity() - .UseOperationExecuter(); + .UseOperationExecutor(); } public static IQueryExecutionBuilder UseInstrumentation( @@ -80,7 +80,7 @@ public static IQueryExecutionBuilder UseExceptionHandling( return builder.Use(); } - public static IQueryExecutionBuilder UseOperationExecuter( + public static IQueryExecutionBuilder UseOperationExecutor( this IQueryExecutionBuilder builder) { return builder.Use(); diff --git a/src/Core/Core/Execution/QueryExecuter.cs b/src/Core/Core/Execution/QueryExecuter.cs index b8354a12be1..584316735ee 100644 --- a/src/Core/Core/Execution/QueryExecuter.cs +++ b/src/Core/Core/Execution/QueryExecuter.cs @@ -6,13 +6,13 @@ namespace HotChocolate.Execution { - internal class QueryExecuter - : IQueryExecuter + internal class QueryExecutor + : IQueryExecutor { private readonly IServiceProvider _applicationServices; private readonly QueryDelegate _queryDelegate; - public QueryExecuter( + public QueryExecutor( ISchema schema, IServiceProvider applicationServices, QueryDelegate queryDelegate) diff --git a/src/Core/Core/Execution/QueryExecuterExtensions.cs b/src/Core/Core/Execution/QueryExecuterExtensions.cs index 60928f91a13..f79c7ace081 100644 --- a/src/Core/Core/Execution/QueryExecuterExtensions.cs +++ b/src/Core/Core/Execution/QueryExecuterExtensions.cs @@ -4,42 +4,42 @@ namespace HotChocolate.Execution { - public static class QueryExecuterExtensions + public static class QueryExecutorExtensions { public static Task ExecuteAsync( - this IQueryExecuter executer, + this IQueryExecutor executor, QueryRequest request) { - return executer.ExecuteAsync( + return executor.ExecuteAsync( request, CancellationToken.None); } public static Task ExecuteAsync( - this IQueryExecuter executer, + this IQueryExecutor executor, string query) { - return executer.ExecuteAsync( + return executor.ExecuteAsync( new QueryRequest(query), CancellationToken.None); } public static Task ExecuteAsync( - this IQueryExecuter executer, + this IQueryExecutor executor, string query, CancellationToken cancellationToken) { - return executer.ExecuteAsync( + return executor.ExecuteAsync( new QueryRequest(query), cancellationToken); } public static Task ExecuteAsync( - this IQueryExecuter executer, + this IQueryExecutor executor, string query, IReadOnlyDictionary variableValues) { - return executer.ExecuteAsync( + return executor.ExecuteAsync( new QueryRequest(query) { VariableValues = variableValues @@ -48,12 +48,12 @@ public static Task ExecuteAsync( } public static Task ExecuteAsync( - this IQueryExecuter executer, + this IQueryExecutor executor, string query, IReadOnlyDictionary variableValues, CancellationToken cancellationToken) { - return executer.ExecuteAsync( + return executor.ExecuteAsync( new QueryRequest(query) { VariableValues = variableValues @@ -62,29 +62,29 @@ public static Task ExecuteAsync( } public static IExecutionResult Execute( - this IQueryExecuter executer, + this IQueryExecutor executor, QueryRequest request) { return Task.Factory.StartNew( - () => ExecuteAsync(executer, request)) + () => ExecuteAsync(executor, request)) .Unwrap() .GetAwaiter() .GetResult(); } public static IExecutionResult Execute( - this IQueryExecuter executer, + this IQueryExecutor executor, string query) { - return executer.Execute(new QueryRequest(query)); + return executor.Execute(new QueryRequest(query)); } public static IExecutionResult Execute( - this IQueryExecuter executer, + this IQueryExecutor executor, string query, IReadOnlyDictionary variableValues) { - return executer.Execute( + return executor.Execute( new QueryRequest(query) { VariableValues = variableValues diff --git a/src/Core/Core/Execution/QueryExecutionBuilder.cs b/src/Core/Core/Execution/QueryExecutionBuilder.cs index d7a18069ef6..0c07fb7c474 100644 --- a/src/Core/Core/Execution/QueryExecutionBuilder.cs +++ b/src/Core/Core/Execution/QueryExecutionBuilder.cs @@ -41,7 +41,7 @@ public IQueryExecutionBuilder UseField(FieldMiddleware middleware) return this; } - public IQueryExecuter Build(ISchema schema) + public IQueryExecutor Build(ISchema schema) { if (schema == null) { @@ -54,7 +54,7 @@ public IQueryExecuter Build(ISchema schema) QueryDelegate middleware = Compile(_middlewareComponents); - return new QueryExecuter(schema, services, middleware); + return new QueryExecutor(schema, services, middleware); } private ServiceCollection CopyServiceCollection() @@ -84,10 +84,10 @@ private QueryDelegate Compile(IEnumerable components) public static IQueryExecutionBuilder New() => new QueryExecutionBuilder(); - public static IQueryExecuter BuildDefault(ISchema schema) => + public static IQueryExecutor BuildDefault(ISchema schema) => New().UseDefaultPipeline().Build(schema); - public static IQueryExecuter BuildDefault(ISchema schema, + public static IQueryExecutor BuildDefault(ISchema schema, IQueryExecutionOptionsAccessor options) => New().UseDefaultPipeline(options).Build(schema); } diff --git a/src/Core/Core/ExecutionSchemaExtensions.cs b/src/Core/Core/ExecutionSchemaExtensions.cs index ad91b7181c7..c0c6fe20b9b 100644 --- a/src/Core/Core/ExecutionSchemaExtensions.cs +++ b/src/Core/Core/ExecutionSchemaExtensions.cs @@ -8,20 +8,20 @@ namespace HotChocolate { public static class ExecutionSchemaExtensions { - public static IQueryExecuter MakeExecutable( + public static IQueryExecutor MakeExecutable( this ISchema schema) { return QueryExecutionBuilder.BuildDefault(schema); } - public static IQueryExecuter MakeExecutable( + public static IQueryExecutor MakeExecutable( this ISchema schema, IQueryExecutionOptionsAccessor options) { return QueryExecutionBuilder.BuildDefault(schema, options); } - public static IQueryExecuter MakeExecutable( + public static IQueryExecutor MakeExecutable( this ISchema schema, Func configure) { diff --git a/src/Core/Core/LegacySchemaExtensions.cs b/src/Core/Core/LegacySchemaExtensions.cs index 0ca6c31dcd8..09de54f7951 100644 --- a/src/Core/Core/LegacySchemaExtensions.cs +++ b/src/Core/Core/LegacySchemaExtensions.cs @@ -70,10 +70,10 @@ public static async Task ExecuteAsync( this ISchema schema, QueryRequest request, CancellationToken cancellationToken = default) { - using (IQueryExecuter executer = QueryExecutionBuilder.New() + using (IQueryExecutor executor = QueryExecutionBuilder.New() .UseDefaultPipeline().Build(schema)) { - return await executer.ExecuteAsync(request, cancellationToken); + return await executor.ExecuteAsync(request, cancellationToken); } } diff --git a/src/Core/Stitching.Tests/HttpQueryExecuterTests.cs b/src/Core/Stitching.Tests/HttpQueryExecuterTests.cs index aff23805743..16b80463d70 100644 --- a/src/Core/Stitching.Tests/HttpQueryExecuterTests.cs +++ b/src/Core/Stitching.Tests/HttpQueryExecuterTests.cs @@ -8,7 +8,7 @@ namespace HotChocolate.Stitching { - public class HttpQueryExecuterTests + public class HttpQueryExecutorTests { [Fact(Skip = "The snapshot is changing to often ...")] @@ -29,10 +29,10 @@ public async Task ExecuteQueryAgainstRemoteSchema() client.BaseAddress = new Uri( "http://api.catalysis-hub.org/graphql"); - var queryExecuter = new HttpQueryExecuter(client); + var queryExecutor = new HttpQueryExecutor(client); // act - IExecutionResult result = await queryExecuter.ExecuteAsync( + IExecutionResult result = await queryExecutor.ExecuteAsync( new QueryRequest(queryText), CancellationToken.None); // assert diff --git a/src/Core/Stitching.Tests/QueryBrokerTests.cs b/src/Core/Stitching.Tests/QueryBrokerTests.cs index c33e93fce86..9be7e867adc 100644 --- a/src/Core/Stitching.Tests/QueryBrokerTests.cs +++ b/src/Core/Stitching.Tests/QueryBrokerTests.cs @@ -49,7 +49,7 @@ name @schema(name: ""b"") .SelectionSet.Selections.OfType().First() .SelectionSet.Selections.OfType().Last(); - var schemas = new Dictionary(); + var schemas = new Dictionary(); schemas["a"] = QueryExecutionBuilder.BuildDefault( Schema.Create(schema_a, c => c.Use(next => context => @@ -134,7 +134,7 @@ type Bar { .SelectionSet.Selections.OfType().First() .SelectionSet.Selections.OfType().Last(); - var schemas = new Dictionary(); + var schemas = new Dictionary(); schemas["a"] = QueryExecutionBuilder.BuildDefault( Schema.Create(schema_a, c => c.Use(next => context => @@ -163,11 +163,11 @@ type Bar { })); var schema = services.BuildServiceProvider().GetService(); - IQueryExecuter executer = schema.MakeExecutable( + IQueryExecutor executor = schema.MakeExecutable( t => t.UseDefaultPipeline().AddParser()); // act - IExecutionResult result = await executer.ExecuteAsync(query); + IExecutionResult result = await executor.ExecuteAsync(query); // assert result.Snapshot(); @@ -226,7 +226,7 @@ ... on Foo { .SelectionSet.Selections.OfType().First() .SelectionSet.Selections.OfType().Last(); - var schemas = new Dictionary(); + var schemas = new Dictionary(); schemas["a"] = QueryExecutionBuilder.BuildDefault( Schema.Create(schema_a, c => c.Use(next => context => diff --git a/src/Core/Stitching/HttpQueryExecuter.cs b/src/Core/Stitching/HttpQueryExecuter.cs index f5ba00bb0cc..c83169d561f 100644 --- a/src/Core/Stitching/HttpQueryExecuter.cs +++ b/src/Core/Stitching/HttpQueryExecuter.cs @@ -11,12 +11,12 @@ namespace HotChocolate.Stitching { - public class HttpQueryExecuter - : IQueryExecuter + public class HttpQueryExecutor + : IQueryExecutor { private HttpClient _client; - public HttpQueryExecuter(HttpClient client) + public HttpQueryExecutor(HttpClient client) { _client = client ?? throw new ArgumentNullException(nameof(client)); diff --git a/src/Core/Stitching/IStitchingContext.cs b/src/Core/Stitching/IStitchingContext.cs index 38da64a7d41..71b0957f25a 100644 --- a/src/Core/Stitching/IStitchingContext.cs +++ b/src/Core/Stitching/IStitchingContext.cs @@ -4,6 +4,6 @@ namespace HotChocolate.Stitching { public interface IStitchingContext { - IQueryExecuter GetQueryExecuter(string schemaName); + IQueryExecutor GetQueryExecutor(string schemaName); } } diff --git a/src/Core/Stitching/QueryBroker.cs b/src/Core/Stitching/QueryBroker.cs index 418dd331192..ab8d7b7fb27 100644 --- a/src/Core/Stitching/QueryBroker.cs +++ b/src/Core/Stitching/QueryBroker.cs @@ -26,12 +26,12 @@ public Task RedirectQueryAsync( string schemaName = directiveContext.FieldSelection.GetSchemaName(); var stitchingCtx = directiveContext.Service(); - IQueryExecuter queryExecuter = - stitchingCtx.GetQueryExecuter(schemaName); + IQueryExecutor queryExecutor = + stitchingCtx.GetQueryExecutor(schemaName); QueryRequest queryRequest = CreateQuery(directiveContext); - return queryExecuter.ExecuteAsync( + return queryExecutor.ExecuteAsync( queryRequest, directiveContext.RequestAborted); } diff --git a/src/Core/Stitching/StitchingContext.cs b/src/Core/Stitching/StitchingContext.cs index 2244d1e50c1..c34b019d39a 100644 --- a/src/Core/Stitching/StitchingContext.cs +++ b/src/Core/Stitching/StitchingContext.cs @@ -8,16 +8,16 @@ namespace HotChocolate.Stitching public class StitchingContext : IStitchingContext { - private readonly IDictionary _queryExecuters; + private readonly IDictionary _queryExecutors; public StitchingContext( - IDictionary queryExecuters) + IDictionary queryExecutors) { - _queryExecuters = queryExecuters - ?? throw new ArgumentNullException(nameof(queryExecuters)); + _queryExecutors = queryExecutors + ?? throw new ArgumentNullException(nameof(queryExecutors)); } - public IQueryExecuter GetQueryExecuter(string schemaName) + public IQueryExecutor GetQueryExecutor(string schemaName) { if (string.IsNullOrEmpty(schemaName)) { @@ -26,11 +26,11 @@ public IQueryExecuter GetQueryExecuter(string schemaName) nameof(schemaName)); } - if (_queryExecuters.TryGetValue( + if (_queryExecutors.TryGetValue( schemaName, - out IQueryExecuter executer)) + out IQueryExecutor executor)) { - return executer; + return executor; } throw new ArgumentException( diff --git a/src/Core/Subscriptions.Tests/SubscriptionTests.cs b/src/Core/Subscriptions.Tests/SubscriptionTests.cs index e3a20205dc0..f9af5133d78 100644 --- a/src/Core/Subscriptions.Tests/SubscriptionTests.cs +++ b/src/Core/Subscriptions.Tests/SubscriptionTests.cs @@ -34,14 +34,14 @@ public async Task Subscribe_RaiseEvent_ReceiveSubscriptionResult() c.RegisterSubscriptionType(); }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); var responseStream = - await executer.ExecuteAsync("subscription { foo }") + await executor.ExecuteAsync("subscription { foo }") as IResponseStream; // act - await executer.ExecuteAsync("mutation { foo }"); + await executor.ExecuteAsync("mutation { foo }"); // assert IReadOnlyQueryResult result = await responseStream.ReadAsync(); diff --git a/src/Core/Types.Tests/Configuration/MiddlewareConfigurationTests.cs b/src/Core/Types.Tests/Configuration/MiddlewareConfigurationTests.cs index c1a33b679e7..25a55dd36b9 100644 --- a/src/Core/Types.Tests/Configuration/MiddlewareConfigurationTests.cs +++ b/src/Core/Types.Tests/Configuration/MiddlewareConfigurationTests.cs @@ -31,10 +31,10 @@ public async Task MiddlewareConfig_MapWithDelegate() return Task.CompletedTask; })); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync("{ a b }"); + IExecutionResult result = await executor.ExecuteAsync("{ a b }"); // assert result.Snapshot(); @@ -56,10 +56,10 @@ public async Task MiddlewareConfig_MapWithClass() return Task.CompletedTask; })); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync("{ a b }"); + IExecutionResult result = await executor.ExecuteAsync("{ a b }"); // assert result.Snapshot(); @@ -82,10 +82,10 @@ public async Task MiddlewareConfig_MapWithClassFactory() return Task.CompletedTask; })); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync("{ a b }"); + IExecutionResult result = await executor.ExecuteAsync("{ a b }"); // assert result.Snapshot(); diff --git a/src/Core/Types.Tests/Types/Descriptors/ObjectTypeDescriptorTests.cs b/src/Core/Types.Tests/Types/Descriptors/ObjectTypeDescriptorTests.cs index 986e1f6b70d..08f9b9e8332 100644 --- a/src/Core/Types.Tests/Types/Descriptors/ObjectTypeDescriptorTests.cs +++ b/src/Core/Types.Tests/Types/Descriptors/ObjectTypeDescriptorTests.cs @@ -150,10 +150,10 @@ public async Task UseMiddleware() { // arrange ISchema schema = Schema.Create(c => c.RegisterQueryType()); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync("{ a b c}"); + IExecutionResult result = await executor.ExecuteAsync("{ a b c}"); // assert result.Snapshot(); diff --git a/src/Core/Types.Tests/Types/ObjectTypeTests.cs b/src/Core/Types.Tests/Types/ObjectTypeTests.cs index 58c377d67c6..cbdec25ea93 100644 --- a/src/Core/Types.Tests/Types/ObjectTypeTests.cs +++ b/src/Core/Types.Tests/Types/ObjectTypeTests.cs @@ -563,10 +563,10 @@ public async Task ObjectType_SourceTypeObject_BindsResolverCorrectly() var schema = Schema.Create(t => t.RegisterQueryType(objectType)); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act - IExecutionResult result = await executer.ExecuteAsync( + IExecutionResult result = await executor.ExecuteAsync( new QueryRequest("{ desc }") { InitialValue = new Foo() diff --git a/src/Core/Types.Tests/Types/Relay/ConnectionTypeTests.cs b/src/Core/Types.Tests/Types/Relay/ConnectionTypeTests.cs index bfbc29605ec..37769c574ed 100644 --- a/src/Core/Types.Tests/Types/Relay/ConnectionTypeTests.cs +++ b/src/Core/Types.Tests/Types/Relay/ConnectionTypeTests.cs @@ -62,7 +62,7 @@ public async Task ExecuteQueryWithPaging() // arrange ISchema schema = Schema.Create( c => c.RegisterQueryType()); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); string query = @" { @@ -81,7 +81,7 @@ public async Task ExecuteQueryWithPaging() "; // act - IExecutionResult result = await executer + IExecutionResult result = await executor .ExecuteAsync(new QueryRequest(query)); // assert diff --git a/src/Core/Types.Tests/Types/Relay/IdMiddlewareTests.cs b/src/Core/Types.Tests/Types/Relay/IdMiddlewareTests.cs index 45c02936443..219c7cca5a2 100644 --- a/src/Core/Types.Tests/Types/Relay/IdMiddlewareTests.cs +++ b/src/Core/Types.Tests/Types/Relay/IdMiddlewareTests.cs @@ -17,11 +17,11 @@ public async Task ExecuteQueryThatReturnsId_IdShouldBeOpaque() t.UseGlobalObjectIdentifier(); }); - IQueryExecuter executer = schema.MakeExecutable(); + IQueryExecutor executor = schema.MakeExecutable(); // act IExecutionResult result = - await executer.ExecuteAsync("{ id string }"); + await executor.ExecuteAsync("{ id string }"); // assert result.Snapshot(); diff --git a/src/Server/AspNetCore.Tests/Authorization/AuthorizationTests.cs b/src/Server/AspNetCore.Tests/Authorization/AuthorizationTests.cs index cdca1950295..846da71cac5 100644 --- a/src/Server/AspNetCore.Tests/Authorization/AuthorizationTests.cs +++ b/src/Server/AspNetCore.Tests/Authorization/AuthorizationTests.cs @@ -1,47 +1,47 @@ using System; -using System.Net; -using System.Net.Http; +using System.Net; +using System.Net.Http; using System.Security.Claims; -using System.Threading.Tasks; -using ChilliCream.Testing; -using HotChocolate.Execution; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.TestHost; -using Microsoft.Extensions.DependencyInjection; -using Newtonsoft.Json; -using Xunit; - -namespace HotChocolate.AspNetCore.Authorization -{ - public class AuthorizationTests - : IClassFixture - { - public AuthorizationTests(TestServerFactory testServerFactory) - { - TestServerFactory = testServerFactory; - } - - +using System.Threading.Tasks; +using ChilliCream.Testing; +using HotChocolate.Execution; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.DependencyInjection; +using Newtonsoft.Json; +using Xunit; + +namespace HotChocolate.AspNetCore.Authorization +{ + public class AuthorizationTests + : IClassFixture + { + public AuthorizationTests(TestServerFactory testServerFactory) + { + TestServerFactory = testServerFactory; + } + + private TestServerFactory TestServerFactory { get; } [Fact] - public async Task DefaultPolicy_NotFound() - { + public async Task DefaultPolicy_NotFound() + { // arrange TestServer server = CreateTestServer( - services => - { - services.AddAuthorization(options => + services => + { + services.AddAuthorization(options => { - options.DefaultPolicy = null; - }); - - services.AddGraphQL(CreateExecuter()); + options.DefaultPolicy = null; + }); + + services.AddGraphQL(CreateExecutor()); }, - context => + context => { - // no user + // no user }); var request = "{ default }"; @@ -58,7 +58,7 @@ public async Task DefaultPolicy_NotFound() ClientQueryResult result = JsonConvert .DeserializeObject(json); Assert.NotNull(result.Errors); - result.Snapshot(); + result.Snapshot(); } [Fact] @@ -76,7 +76,7 @@ public async Task Policy_NotFound() c.Type == ClaimTypes.DateOfBirth))); }); - services.AddGraphQL(CreateExecuter()); + services.AddGraphQL(CreateExecutor()); }, context => { @@ -115,7 +115,7 @@ public async Task Policy_NotAuthorized() c.Type == ClaimTypes.DateOfBirth))); }); - services.AddGraphQL(CreateExecuter()); + services.AddGraphQL(CreateExecutor()); }, context => { @@ -154,13 +154,13 @@ public async Task Policy_Authorized() c.Type == ClaimTypes.DateOfBirth))); }); - services.AddGraphQL(CreateExecuter()); + services.AddGraphQL(CreateExecutor()); }, context => { var identity = new ClaimsIdentity(); identity.AddClaim(new Claim( - ClaimTypes.DateOfBirth, + ClaimTypes.DateOfBirth, "2013-05-30")); context.User.AddIdentity(identity); }); @@ -189,7 +189,7 @@ public async Task Roles_UserHasNoRoles_NotAuthorized() TestServer server = CreateTestServer( services => { - services.AddGraphQL(CreateExecuter()); + services.AddGraphQL(CreateExecutor()); }, context => { @@ -211,8 +211,8 @@ public async Task Roles_UserHasNoRoles_NotAuthorized() .DeserializeObject(json); Assert.NotNull(result.Errors); result.Snapshot(); - } - + } + [Fact] public async Task Roles_UserHasDifferentRoles_NotAuthorized() { @@ -220,7 +220,7 @@ public async Task Roles_UserHasDifferentRoles_NotAuthorized() TestServer server = CreateTestServer( services => { - services.AddGraphQL(CreateExecuter()); + services.AddGraphQL(CreateExecutor()); }, context => { @@ -246,8 +246,8 @@ public async Task Roles_UserHasDifferentRoles_NotAuthorized() .DeserializeObject(json); Assert.NotNull(result.Errors); result.Snapshot(); - } - + } + [Fact] public async Task Roles_UserHasOneOfTheRoles_NotAuthorized() { @@ -255,7 +255,7 @@ public async Task Roles_UserHasOneOfTheRoles_NotAuthorized() TestServer server = CreateTestServer( services => { - services.AddGraphQL(CreateExecuter()); + services.AddGraphQL(CreateExecutor()); }, context => { @@ -293,7 +293,7 @@ public async Task Roles_UserHasAllOfTheRoles_Authorized() TestServer server = CreateTestServer( services => { - services.AddGraphQL(CreateExecuter()); + services.AddGraphQL(CreateExecutor()); }, context => { @@ -331,7 +331,7 @@ public async Task Roles_Authorized() TestServer server = CreateTestServer( services => { - services.AddGraphQL(CreateExecuter()); + services.AddGraphQL(CreateExecutor()); }, context => { @@ -379,16 +379,16 @@ public async Task PipedAuthorizeDirectives_Authorized() c.Type == ClaimTypes.Country))); }); - services.AddGraphQL(CreateExecuter()); + services.AddGraphQL(CreateExecutor()); }, context => { - var identity = new ClaimsIdentity(); - identity.AddClaim(new Claim( - ClaimTypes.DateOfBirth, - "2013-05-30")); - identity.AddClaim(new Claim( - ClaimTypes.Country, + var identity = new ClaimsIdentity(); + identity.AddClaim(new Claim( + ClaimTypes.DateOfBirth, + "2013-05-30")); + identity.AddClaim(new Claim( + ClaimTypes.Country, "US")); context.User.AddIdentity(identity); }); @@ -408,8 +408,8 @@ public async Task PipedAuthorizeDirectives_Authorized() .DeserializeObject(json); Assert.Null(result.Errors); result.Snapshot(); - } - + } + [Fact] public async Task PipedAuthorizeDirectives_SecondFails_NotAuthorized() { @@ -430,7 +430,7 @@ public async Task PipedAuthorizeDirectives_SecondFails_NotAuthorized() c.Type == ClaimTypes.Country))); }); - services.AddGraphQL(CreateExecuter()); + services.AddGraphQL(CreateExecutor()); }, context => { @@ -456,33 +456,33 @@ public async Task PipedAuthorizeDirectives_SecondFails_NotAuthorized() .DeserializeObject(json); Assert.NotNull(result.Errors); result.Snapshot(); - } - + } + private TestServer CreateTestServer( Action configureServices, - Action configureUser) - { - return TestServerFactory.Create( - builder => + Action configureUser) + { + return TestServerFactory.Create( + builder => { return builder .ConfigureServices(configureServices) - .Configure(app => - { - app.UseGraphQL(new QueryMiddlewareOptions - { - OnCreateRequest = (ctx, r, p, ct) => - { - configureUser(ctx); - return Task.CompletedTask; - } - }); - }); - }); - } - - - private static IQueryExecuter CreateExecuter() + .Configure(app => + { + app.UseGraphQL(new QueryMiddlewareOptions + { + OnCreateRequest = (ctx, r, p, ct) => + { + configureUser(ctx); + return Task.CompletedTask; + } + }); + }); + }); + } + + + private static IQueryExecutor CreateExecutor() { return Schema.Create( @" @@ -496,16 +496,16 @@ type Query { @authorize(policy: ""b"") } ", - configuration => - { - configuration.RegisterAuthorizeDirectiveType(); - configuration.Use(next => context => - { - context.Result = "foo"; + configuration => + { + configuration.RegisterAuthorizeDirectiveType(); + configuration.Use(next => context => + { + context.Result = "foo"; return next.Invoke(context); - }); + }); }) - .MakeExecutable(); - } - } -} + .MakeExecutable(); + } + } +} diff --git a/src/Server/AspNetCore.Tests/Subscriptions/InMemoryWebSocketContext.cs b/src/Server/AspNetCore.Tests/Subscriptions/InMemoryWebSocketContext.cs index be88c594de9..a8dcff1fe58 100644 --- a/src/Server/AspNetCore.Tests/Subscriptions/InMemoryWebSocketContext.cs +++ b/src/Server/AspNetCore.Tests/Subscriptions/InMemoryWebSocketContext.cs @@ -26,7 +26,7 @@ internal class InMemoryWebSocketContext public HttpContext HttpContext => throw new NotImplementedException(); - public IQueryExecuter QueryExecuter { get; set; } + public IQueryExecutor QueryExecutor { get; set; } public WebSocketCloseStatus? CloseStatus { get; set; } diff --git a/src/Server/AspNetCore/ApplicationBuilderExtensions.cs b/src/Server/AspNetCore/ApplicationBuilderExtensions.cs index 46b076bcddc..d25f1c99e7c 100644 --- a/src/Server/AspNetCore/ApplicationBuilderExtensions.cs +++ b/src/Server/AspNetCore/ApplicationBuilderExtensions.cs @@ -86,18 +86,18 @@ public static IApplicationBuilder UseGraphQL( throw new ArgumentNullException(nameof(options)); } - var executer = (IQueryExecuter)serviceProvider - .GetService(typeof(IQueryExecuter)); + var executor = (IQueryExecutor)serviceProvider + .GetService(typeof(IQueryExecutor)); var serializer = (IQueryResultSerializer)serviceProvider .GetService(typeof(IQueryResultSerializer)) ?? new JsonQueryResultSerializer(); return applicationBuilder - .Use(executer, serializer, options) - .Use(executer, serializer, options) - //.Use(executer, options) - .Use(executer, options); + .Use(executor, serializer, options) + .Use(executor, serializer, options) + //.Use(executor, options) + .Use(executor, options); } #else public static IApplicationBuilder UseGraphQL( diff --git a/src/Server/AspNetCore/GetQueryMiddleware.cs b/src/Server/AspNetCore/GetQueryMiddleware.cs index 93a09e45cf0..79969cbfadb 100644 --- a/src/Server/AspNetCore/GetQueryMiddleware.cs +++ b/src/Server/AspNetCore/GetQueryMiddleware.cs @@ -28,10 +28,10 @@ public class GetQueryMiddleware public GetQueryMiddleware( RequestDelegate next, - IQueryExecuter queryExecuter, + IQueryExecutor queryExecutor, IQueryResultSerializer resultSerializer, QueryMiddlewareOptions options) - : base(next, queryExecuter, resultSerializer, options) + : base(next, queryExecutor, resultSerializer, options) { } /// diff --git a/src/Server/AspNetCore/PostQueryMiddleware.cs b/src/Server/AspNetCore/PostQueryMiddleware.cs index 6b6005f400e..138caf87ac4 100644 --- a/src/Server/AspNetCore/PostQueryMiddleware.cs +++ b/src/Server/AspNetCore/PostQueryMiddleware.cs @@ -24,10 +24,10 @@ public class PostQueryMiddleware { public PostQueryMiddleware( RequestDelegate next, - IQueryExecuter queryExecuter, + IQueryExecutor queryExecutor, IQueryResultSerializer resultSerializer, QueryMiddlewareOptions options) - : base(next, queryExecuter, resultSerializer, options) + : base(next, queryExecutor, resultSerializer, options) { } protected override bool CanHandleRequest(HttpContext context) diff --git a/src/Server/AspNetCore/QueryMiddlewareBase.cs b/src/Server/AspNetCore/QueryMiddlewareBase.cs index 988ec275079..d740d118925 100644 --- a/src/Server/AspNetCore/QueryMiddlewareBase.cs +++ b/src/Server/AspNetCore/QueryMiddlewareBase.cs @@ -28,7 +28,7 @@ public abstract class QueryMiddlewareBase : RequestDelegate #endif { - private readonly IQueryExecuter _queryExecuter; + private readonly IQueryExecutor _queryExecutor; private readonly IQueryResultSerializer _resultSerializer; /// @@ -38,14 +38,14 @@ public abstract class QueryMiddlewareBase /// /// An optional pointer to the next component. /// - /// + /// /// A required query executor resolver. /// /// /// protected QueryMiddlewareBase( RequestDelegate next, - IQueryExecuter queryExecuter, + IQueryExecutor queryExecutor, IQueryResultSerializer resultSerializer, QueryMiddlewareOptions options) #if ASPNETCLASSIC @@ -55,23 +55,23 @@ protected QueryMiddlewareBase( #if !ASPNETCLASSIC Next = next; #endif - _queryExecuter = queryExecuter ?? - throw new ArgumentNullException(nameof(queryExecuter)); + _queryExecutor = queryExecutor ?? + throw new ArgumentNullException(nameof(queryExecutor)); _resultSerializer = resultSerializer ?? throw new ArgumentNullException(nameof(resultSerializer)); Options = options ?? throw new ArgumentNullException(nameof(options)); - Services = Executer.Schema.Services; + Services = Executor.Schema.Services; } /// - /// Gets the GraphQL query executer resolver. + /// Gets the GraphQL query executor resolver. /// - protected IQueryExecuter Executer + protected IQueryExecutor Executor { get { - return _queryExecuter; + return _queryExecutor; } } @@ -103,7 +103,7 @@ public async Task InvokeAsync(HttpContext context) { try { - await HandleRequestAsync(context, Executer) + await HandleRequestAsync(context, Executor) .ConfigureAwait(false); } catch (NotSupportedException) @@ -179,11 +179,11 @@ await onCreateRequest(context, request, requestProperties, private async Task HandleRequestAsync( HttpContext context, - IQueryExecuter queryExecuter) + IQueryExecutor queryExecutor) { QueryRequest request = await CreateQueryRequestInternal(context) .ConfigureAwait(false); - IExecutionResult result = await queryExecuter + IExecutionResult result = await queryExecutor .ExecuteAsync(request, context.GetCancellationToken()) .ConfigureAwait(false); diff --git a/src/Server/AspNetCore/SchemaMiddleware.cs b/src/Server/AspNetCore/SchemaMiddleware.cs index 7db3f7d6c3d..a5cf51f5e9e 100644 --- a/src/Server/AspNetCore/SchemaMiddleware.cs +++ b/src/Server/AspNetCore/SchemaMiddleware.cs @@ -24,11 +24,11 @@ internal sealed class SchemaMiddleware #endif { private readonly PathString _path; - private readonly IQueryExecuter _queryExecuter; + private readonly IQueryExecutor _queryExecutor; public SchemaMiddleware( RequestDelegate next, - IQueryExecuter queryExecuter, + IQueryExecutor queryExecutor, QueryMiddlewareOptions options) #if ASPNETCLASSIC : base(next) @@ -42,8 +42,8 @@ public SchemaMiddleware( throw new ArgumentNullException(nameof(options)); } - _queryExecuter = queryExecuter - ?? throw new ArgumentNullException(nameof(queryExecuter)); + _queryExecutor = queryExecutor + ?? throw new ArgumentNullException(nameof(queryExecutor)); _path = options.Path.Add(new PathString("/schema")); } @@ -69,7 +69,7 @@ public async Task InvokeAsync(HttpContext context) context.Response.Body)) { SchemaSerializer.Serialize( - _queryExecuter.Schema, + _queryExecutor.Schema, streamWriter); await streamWriter.FlushAsync(); diff --git a/src/Server/AspNetCore/ServiceCollectionExtensions.cs b/src/Server/AspNetCore/ServiceCollectionExtensions.cs index 14fcc781ac3..5480f3926ea 100644 --- a/src/Server/AspNetCore/ServiceCollectionExtensions.cs +++ b/src/Server/AspNetCore/ServiceCollectionExtensions.cs @@ -5,7 +5,7 @@ namespace HotChocolate { - public delegate IQueryExecuter BuildExecuter( + public delegate IQueryExecutor BuildExecutor( IServiceProvider services, IQueryExecutionBuilder builder); @@ -193,34 +193,34 @@ public static IServiceCollection AddGraphQL( public static IServiceCollection AddGraphQL( this IServiceCollection serviceCollection, - IQueryExecuter executer) + IQueryExecutor executor) { - if (executer == null) + if (executor == null) { - throw new ArgumentNullException(nameof(executer)); + throw new ArgumentNullException(nameof(executor)); } return serviceCollection - .AddSingleton(executer) + .AddSingleton(executor) .AddSingleton(s => - s.GetRequiredService().Schema) + s.GetRequiredService().Schema) .AddJsonSerializer(); } public static IServiceCollection AddGraphQL( this IServiceCollection serviceCollection, - BuildExecuter buildExecuter) + BuildExecutor buildExecutor) { - if (buildExecuter == null) + if (buildExecutor == null) { - throw new ArgumentNullException(nameof(buildExecuter)); + throw new ArgumentNullException(nameof(buildExecutor)); } return serviceCollection - .AddSingleton(s => - buildExecuter(s, QueryExecutionBuilder.New())) + .AddSingleton(s => + buildExecutor(s, QueryExecutionBuilder.New())) .AddSingleton(s => - s.GetRequiredService().Schema) + s.GetRequiredService().Schema) .AddJsonSerializer(); } diff --git a/src/Server/AspNetCore/SubscriptionMiddleware.cs b/src/Server/AspNetCore/SubscriptionMiddleware.cs index c58cbb6a9eb..eac5d5b8e30 100644 --- a/src/Server/AspNetCore/SubscriptionMiddleware.cs +++ b/src/Server/AspNetCore/SubscriptionMiddleware.cs @@ -14,18 +14,18 @@ public class SubscriptionMiddleware public SubscriptionMiddleware( RequestDelegate next, - IQueryExecuter queryExecuter, + IQueryExecutor queryExecutor, QueryMiddlewareOptions options) { _next = next ?? throw new ArgumentNullException(nameof(next)); - Executer = queryExecuter - ?? throw new ArgumentNullException(nameof(queryExecuter)); + Executor = queryExecutor + ?? throw new ArgumentNullException(nameof(queryExecutor)); Options = options ?? throw new ArgumentNullException(nameof(options)); } - protected IQueryExecuter Executer { get; } + protected IQueryExecutor Executor { get; } protected QueryMiddlewareOptions Options { get; } @@ -40,7 +40,7 @@ public async Task InvokeAsync(HttpContext context) ?? GetService(context); WebSocketSession session = await WebSocketSession - .TryCreateAsync(context, Executer, onConnect, onRequest) + .TryCreateAsync(context, Executor, onConnect, onRequest) .ConfigureAwait(false); if (session != null) diff --git a/src/Server/AspNetCore/Subscriptions/IWebSocketContext.cs b/src/Server/AspNetCore/Subscriptions/IWebSocketContext.cs index 46137dd7069..48b789ac908 100644 --- a/src/Server/AspNetCore/Subscriptions/IWebSocketContext.cs +++ b/src/Server/AspNetCore/Subscriptions/IWebSocketContext.cs @@ -16,7 +16,7 @@ internal interface IWebSocketContext { HttpContext HttpContext { get; } - IQueryExecuter QueryExecuter { get; } + IQueryExecutor QueryExecutor { get; } WebSocketCloseStatus? CloseStatus { get; } diff --git a/src/Server/AspNetCore/Subscriptions/SubscriptionStartHandler.cs b/src/Server/AspNetCore/Subscriptions/SubscriptionStartHandler.cs index c90e3946c7e..f7f5ddd19c5 100644 --- a/src/Server/AspNetCore/Subscriptions/SubscriptionStartHandler.cs +++ b/src/Server/AspNetCore/Subscriptions/SubscriptionStartHandler.cs @@ -32,7 +32,7 @@ await context.PrepareRequestAsync(request) .ConfigureAwait(false); IExecutionResult result = - await context.QueryExecuter.ExecuteAsync( + await context.QueryExecutor.ExecuteAsync( request, cancellationToken) .ConfigureAwait(false); diff --git a/src/Server/AspNetCore/Subscriptions/WebSocketContext.cs b/src/Server/AspNetCore/Subscriptions/WebSocketContext.cs index 4be0bea4d09..e892089edca 100644 --- a/src/Server/AspNetCore/Subscriptions/WebSocketContext.cs +++ b/src/Server/AspNetCore/Subscriptions/WebSocketContext.cs @@ -26,7 +26,7 @@ internal class WebSocketContext public WebSocketContext( HttpContext httpContext, WebSocket webSocket, - IQueryExecuter queryExecuter, + IQueryExecutor queryExecutor, OnConnectWebSocketAsync onConnectAsync, OnCreateRequestAsync onCreateRequest) { @@ -34,8 +34,8 @@ public WebSocketContext( ?? throw new ArgumentNullException(nameof(httpContext)); WebSocket = webSocket ?? throw new ArgumentNullException(nameof(webSocket)); - QueryExecuter = queryExecuter - ?? throw new ArgumentNullException(nameof(queryExecuter)); + QueryExecutor = queryExecutor + ?? throw new ArgumentNullException(nameof(queryExecutor)); _onConnectAsync = onConnectAsync; _onCreateRequest = onCreateRequest; @@ -43,7 +43,7 @@ public WebSocketContext( public HttpContext HttpContext { get; } - public IQueryExecuter QueryExecuter { get; } + public IQueryExecutor QueryExecutor { get; } public WebSocket WebSocket { get; } diff --git a/src/Server/AspNetCore/Subscriptions/WebSocketSession.cs b/src/Server/AspNetCore/Subscriptions/WebSocketSession.cs index 5543dfea1da..d4238f9756f 100644 --- a/src/Server/AspNetCore/Subscriptions/WebSocketSession.cs +++ b/src/Server/AspNetCore/Subscriptions/WebSocketSession.cs @@ -115,7 +115,7 @@ public void Dispose() public static async Task TryCreateAsync( HttpContext httpContext, - IQueryExecuter queryExecuter, + IQueryExecutor queryExecutor, OnConnectWebSocketAsync onConnectAsync, OnCreateRequestAsync onCreateRequest) { @@ -124,9 +124,9 @@ public static async Task TryCreateAsync( throw new ArgumentNullException(nameof(httpContext)); } - if (queryExecuter == null) + if (queryExecutor == null) { - throw new ArgumentNullException(nameof(queryExecuter)); + throw new ArgumentNullException(nameof(queryExecutor)); } WebSocket socket = await httpContext.WebSockets @@ -136,7 +136,7 @@ public static async Task TryCreateAsync( .Contains(socket.SubProtocol)) { var context = new WebSocketContext( - httpContext, socket, queryExecuter, + httpContext, socket, queryExecutor, onConnectAsync, onCreateRequest); return new WebSocketSession(context);