Skip to content

[Fusion] Make capabilities opt-out #9497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobias-tengler merged 3 commits into from
Apr 1, 2026
Merged

[Fusion] Make capabilities opt-out #9497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66bc7a0
Switch to a opt-out model
tobias-tengler Apr 1, 2026
8972e45
Update method signature
tobias-tengler Apr 1, 2026
426e801
Address feedback
tobias-tengler Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...n.Execution/DependencyInjection/CoreFusionGatewayBuilderExtensions.SourceSchemaClients.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static IFusionGatewayBuilder AddHttpClientConfiguration(
string name,
Uri baseAddress,
SupportedOperationType supportedOperations = SupportedOperationType.All,
SourceSchemaClientCapabilities? capabilities = null,
SourceSchemaClientCapabilities capabilities = SourceSchemaClientCapabilities.All,
ImmutableArray<MediaTypeWithQualityHeaderValue>? defaultAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? batchingAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? subscriptionAcceptHeaderValues = null,
Expand Down Expand Up @@ -122,7 +122,7 @@ public static IFusionGatewayBuilder AddHttpClientConfiguration(
string httpClientName,
Uri baseAddress,
SupportedOperationType supportedOperations = SupportedOperationType.All,
SourceSchemaClientCapabilities? capabilities = null,
SourceSchemaClientCapabilities capabilities = SourceSchemaClientCapabilities.All,
ImmutableArray<MediaTypeWithQualityHeaderValue>? defaultAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? batchingAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? subscriptionAcceptHeaderValues = null,
Expand Down
4 changes: 3 additions & 1 deletion ...Chocolate/Fusion/src/Fusion.Execution/Execution/Clients/SourceSchemaClientCapabilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@ public enum SourceSchemaClientCapabilities
/// The client supports request batching, where multiple independent GraphQL
/// operations are sent as an array in a single HTTP request.
/// </summary>
RequestBatching = 1 << 2
RequestBatching = 1 << 2,

All = VariableBatching | RequestBatching
}
8 changes: 3 additions & 5 deletions ...late/Fusion/src/Fusion.Execution/Execution/Clients/SourceSchemaHttpClientConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public SourceSchemaHttpClientConfiguration(
string name,
Uri baseAddress,
SupportedOperationType supportedOperations = SupportedOperationType.All,
SourceSchemaClientCapabilities? capabilities = null,
SourceSchemaClientCapabilities capabilities = SourceSchemaClientCapabilities.All,
ImmutableArray<MediaTypeWithQualityHeaderValue>? defaultAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? batchingAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? subscriptionAcceptHeaderValues = null,
Expand Down Expand Up @@ -111,7 +111,7 @@ public SourceSchemaHttpClientConfiguration(
string httpClientName,
Uri baseAddress,
SupportedOperationType supportedOperations = SupportedOperationType.All,
SourceSchemaClientCapabilities? capabilities = null,
SourceSchemaClientCapabilities capabilities = SourceSchemaClientCapabilities.All,
ImmutableArray<MediaTypeWithQualityHeaderValue>? defaultAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? batchingAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? subscriptionAcceptHeaderValues = null,
Expand All @@ -127,9 +127,7 @@ public SourceSchemaHttpClientConfiguration(
HttpClientName = httpClientName;
BaseAddress = baseAddress;
SupportedOperations = supportedOperations;
Capabilities = capabilities
?? SourceSchemaClientCapabilities.VariableBatching
| SourceSchemaClientCapabilities.RequestBatching;
Capabilities = capabilities;

DefaultAcceptHeaderValue = defaultAcceptHeaderValues is null
? AcceptContentTypes.DefaultHeader
Expand Down
40 changes: 15 additions & 25 deletions src/HotChocolate/Fusion/src/Fusion.Execution/Execution/FusionRequestExecutorManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@ private static SourceSchemaHttpClientConfiguration CreateHttpClientConfiguration
JsonElement http)
{
var clientName = SourceSchemaHttpClientConfiguration.DefaultClientName;
var capabilities = SourceSchemaClientCapabilities.None;
var supportedOperations = SupportedOperationType.Query | SupportedOperationType.Mutation;
var capabilities = SourceSchemaClientCapabilities.All;
var supportedOperations = SupportedOperationType.All;
ImmutableArray<MediaTypeWithQualityHeaderValue>? defaultAcceptHeaderValues = null;
ImmutableArray<MediaTypeWithQualityHeaderValue>? batchingAcceptHeaderValues = null;
ImmutableArray<MediaTypeWithQualityHeaderValue>? subscriptionAcceptHeaderValues = null;
Expand Down Expand Up @@ -359,21 +359,21 @@ private static SourceSchemaHttpClientConfiguration CreateHttpClientConfiguration
}
}

if (capabilitiesElement.TryGetProperty("batching", out var variableBatching))
if (capabilitiesElement.TryGetProperty("batching", out var batchingElement))
{
if (!variableBatching.TryGetProperty("variableBatching", out var supported)
|| supported.GetBoolean())
if (batchingElement.TryGetProperty("variableBatching", out var supported)
&& !supported.GetBoolean())
{
capabilities |= SourceSchemaClientCapabilities.VariableBatching;
capabilities &= ~SourceSchemaClientCapabilities.VariableBatching;
}

if (!variableBatching.TryGetProperty("requestBatching", out supported)
|| supported.GetBoolean())
if (batchingElement.TryGetProperty("requestBatching", out supported)
&& !supported.GetBoolean())
{
capabilities |= SourceSchemaClientCapabilities.RequestBatching;
capabilities &= ~SourceSchemaClientCapabilities.RequestBatching;
}

if (variableBatching.TryGetProperty("formats", out var formats))
if (batchingElement.TryGetProperty("formats", out var formats))
{
var builder = ImmutableArray.CreateBuilder<MediaTypeWithQualityHeaderValue>();

Expand All @@ -386,15 +386,15 @@ private static SourceSchemaHttpClientConfiguration CreateHttpClientConfiguration
}
}

if (capabilitiesElement.TryGetProperty("subscriptions", out var requestBatching))
if (capabilitiesElement.TryGetProperty("subscriptions", out var subscriptionsElement))
{
if (!requestBatching.TryGetProperty("supported", out var supported)
|| supported.GetBoolean())
if (subscriptionsElement.TryGetProperty("supported", out var supported)
&& !supported.GetBoolean())
{
supportedOperations |= SupportedOperationType.Subscription;
supportedOperations &= ~SupportedOperationType.Subscription;
}

if (requestBatching.TryGetProperty("formats", out var formats))
if (subscriptionsElement.TryGetProperty("formats", out var formats))
{
var builder = ImmutableArray.CreateBuilder<MediaTypeWithQualityHeaderValue>();

Expand All @@ -406,16 +406,6 @@ private static SourceSchemaHttpClientConfiguration CreateHttpClientConfiguration
subscriptionAcceptHeaderValues = builder.ToImmutable();
}
}
else
{
supportedOperations |= SupportedOperationType.Subscription;
}
}
else
{
capabilities = SourceSchemaClientCapabilities.VariableBatching
| SourceSchemaClientCapabilities.RequestBatching;
supportedOperations |= SupportedOperationType.Subscription;
}

return new SourceSchemaHttpClientConfiguration(
Expand Down
4 changes: 2 additions & 2 deletions src/HotChocolate/Fusion/test/Fusion.AspNetCore.Tests/FusionTestBase.CreateSourceSchema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ protected TestServer CreateSourceSchema(
Action<HttpClient>? configureHttpClient = null,
bool isOffline = false,
bool isTimingOut = false,
SourceSchemaClientCapabilities? capabilities = null,
SourceSchemaClientCapabilities capabilities = SourceSchemaClientCapabilities.All,
ImmutableArray<MediaTypeWithQualityHeaderValue>? defaultAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? batchingAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? subscriptionAcceptHeaderValues = null,
Expand Down Expand Up @@ -69,7 +69,7 @@ protected TestServer CreateSourceSchema(
bool isTimingOut = false,
Action<HttpClient>? configureHttpClient = null,
HttpClient? httpClient = null,
SourceSchemaClientCapabilities? capabilities = null,
SourceSchemaClientCapabilities capabilities = SourceSchemaClientCapabilities.All,
ImmutableArray<MediaTypeWithQualityHeaderValue>? defaultAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? batchingAcceptHeaderValues = null,
ImmutableArray<MediaTypeWithQualityHeaderValue>? subscriptionAcceptHeaderValues = null,
Expand Down
2 changes: 1 addition & 1 deletion src/HotChocolate/Fusion/test/Fusion.AspNetCore.Tests/FusionTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ private sealed class SourceSchemaOptions

public Func<HttpRequestMessage, Task<HttpResponseMessage>>? MockHttpResponse { get; set; }

public SourceSchemaClientCapabilities? Capabilities { get; set; }
public SourceSchemaClientCapabilities Capabilities { get; set; } = SourceSchemaClientCapabilities.All;

public ImmutableArray<MediaTypeWithQualityHeaderValue>? DefaultAcceptHeaderValues { get; set; }

Expand Down
Loading
Loading