Skip to content

Commit 6f06fee

Browse files
Shane32Shane32
authored
Remove IGraphQLExecuter and GraphQLOptions (#762)
1 parent 6efc631 commit 6f06fee

32 files changed

+134
-435
lines changed

‎samples/Samples.Schemas.Chat/ChatSubscriptions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public ChatSubscriptions(IChat chat)
2020
Name = "messageAdded",
2121
Type = typeof(MessageType),
2222
Resolver = new FuncFieldResolver<Message>(ResolveMessage),
23-
Subscriber = new EventStreamResolver<Message>(Subscribe)
23+
StreamResolver = new SourceStreamResolver<Message>(Subscribe)
2424
});
2525

2626
AddField(new FieldType
@@ -31,7 +31,7 @@ public ChatSubscriptions(IChat chat)
3131
),
3232
Type = typeof(MessageType),
3333
Resolver = new FuncFieldResolver<Message>(ResolveMessage),
34-
Subscriber = new EventStreamResolver<Message>(SubscribeById)
34+
StreamResolver = new SourceStreamResolver<Message>(SubscribeById)
3535
});
3636
}
3737

‎samples/Samples.Server/Samples.Server.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
<ItemGroup>
1212
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
1313
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
14-
<PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0-preview-500" />
15-
<PackageReference Include="GraphQL.SystemReactive" Version="5.0.0-preview-500" />
16-
<PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-500" />
14+
<PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0" />
15+
<PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0" />
1716
</ItemGroup>
1817

1918
<ItemGroup>

‎samples/Samples.Server/Startup.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Threading.Tasks;
33
using GraphQL.DataLoader;
44
using GraphQL.Execution;
5+
using GraphQL.Instrumentation;
56
using GraphQL.MicrosoftDI;
67
using GraphQL.Samples.Schemas.Chat;
78
using GraphQL.Server;
@@ -10,7 +11,6 @@
1011
using GraphQL.Server.Ui.GraphiQL;
1112
using GraphQL.Server.Ui.Playground;
1213
using GraphQL.Server.Ui.Voyager;
13-
using GraphQL.SystemReactive;
1414
using GraphQL.SystemTextJson;
1515
using Microsoft.AspNetCore.Builder;
1616
using Microsoft.AspNetCore.Hosting;
@@ -42,10 +42,10 @@ public void ConfigureServices(IServiceCollection services)
4242
.AddTransient<IAuthorizationErrorMessageBuilder, DefaultAuthorizationErrorMessageBuilder>(); // required by CustomErrorInfoProvider
4343

4444
services.AddGraphQL(builder => builder
45-
.AddServer(true)
45+
.AddMetrics()
46+
.AddDocumentExecuter<ApolloTracingDocumentExecuter>()
4647
.AddHttpMiddleware<ChatSchema, GraphQLHttpMiddlewareWithLogs<ChatSchema>>()
4748
.AddWebSocketsHttpMiddleware<ChatSchema>()
48-
.AddSubscriptionExecutionStrategy()
4949
.AddSchema<ChatSchema>()
5050
.ConfigureExecutionOptions(options =>
5151
{

‎samples/Samples.Server/StartupWithRouting.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
using System.Threading.Tasks;
33
using GraphQL.DataLoader;
44
using GraphQL.Execution;
5+
using GraphQL.Instrumentation;
56
using GraphQL.MicrosoftDI;
67
using GraphQL.Samples.Schemas.Chat;
78
using GraphQL.Server;
9+
using GraphQL.Server.Authorization.AspNetCore;
810
using GraphQL.Server.Ui.Altair;
911
using GraphQL.Server.Ui.GraphiQL;
1012
using GraphQL.Server.Ui.Playground;
1113
using GraphQL.Server.Ui.Voyager;
12-
using GraphQL.SystemReactive;
1314
using GraphQL.SystemTextJson;
1415
using Microsoft.AspNetCore.Builder;
1516
using Microsoft.AspNetCore.Hosting;
@@ -38,13 +39,14 @@ public void ConfigureServices(IServiceCollection services)
3839
services
3940
.AddRouting()
4041
.AddSingleton<IChat, Chat>()
41-
.Configure<ErrorInfoProviderOptions>(opt => opt.ExposeExceptionStackTrace = Environment.IsDevelopment());
42+
.Configure<ErrorInfoProviderOptions>(opt => opt.ExposeExceptionStackTrace = Environment.IsDevelopment())
43+
.AddTransient<IAuthorizationErrorMessageBuilder, DefaultAuthorizationErrorMessageBuilder>(); // required by CustomErrorInfoProvider
4244

4345
services.AddGraphQL(builder => builder
44-
.AddServer(true)
46+
.AddMetrics()
47+
.AddDocumentExecuter<ApolloTracingDocumentExecuter>()
4548
.AddHttpMiddleware<ChatSchema, GraphQLHttpMiddlewareWithLogs<ChatSchema>>()
4649
.AddWebSocketsHttpMiddleware<ChatSchema>()
47-
.AddSubscriptionExecutionStrategy()
4850
.AddSchema<ChatSchema>()
4951
.ConfigureExecutionOptions(options =>
5052
{

‎src/All/All.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
<ProjectReference Include="..\Ui.Playground\Ui.Playground.csproj" />
2020
<ProjectReference Include="..\Ui.Voyager\Ui.Voyager.csproj" />
2121

22-
<PackageReference Include="GraphQL.MemoryCache" Version="5.0.0-preview-500" />
23-
<PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0-preview-500" />
24-
<PackageReference Include="GraphQL.SystemReactive" Version="5.0.0-preview-500" />
25-
<PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0-preview-500" />
22+
<PackageReference Include="GraphQL.MemoryCache" Version="5.0.0" />
23+
<PackageReference Include="GraphQL.MicrosoftDI" Version="5.0.0" />
24+
<PackageReference Include="GraphQL.SystemTextJson" Version="5.0.0" />
2625
</ItemGroup>
2726

2827
</Project>

‎src/Authorization.AspNetCore/Authorization.AspNetCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<FrameworkReference Include="Microsoft.AspNetCore.App" />
11-
<PackageReference Include="GraphQL" Version="5.0.0-preview-500" />
11+
<PackageReference Include="GraphQL" Version="5.0.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎src/Core/BasicGraphQLExecuter.cs

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎src/Core/Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="GraphQL.DataLoader" Version="5.0.0-preview-500" />
11+
<PackageReference Include="GraphQL.DataLoader" Version="5.0.0" />
1212
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0" />
1313
</ItemGroup>
1414

‎src/Core/DefaultGraphQLExecuter.cs

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎src/Core/Extensions/GraphQLBuilderCoreExtensions.cs

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)